SF.net SVN: ledger-smb:[3285] branches/1.2

[..hidden..]

Revision: 3285
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3285&view=rev
Author:   einhverfr
Date:     2011-06-19 00:49:43 +0000 (Sun, 19 Jun 2011)

Log Message:
-----------
Fix for login with @ signs, updating build files to recommend or require Math::BigInt::GMP

Modified Paths:
--------------
    branches/1.2/LedgerSMB/User.pm
    branches/1.2/Makefile.PL
    branches/1.2/dists/rpm/build.sh
    branches/1.2/dists/rpm/ledgersmb.spec

Modified: branches/1.2/LedgerSMB/User.pm
===================================================================
--- branches/1.2/LedgerSMB/User.pm	2011-06-18 22:15:10 UTC (rev 3284)
+++ branches/1.2/LedgerSMB/User.pm	2011-06-19 00:49:43 UTC (rev 3285)
@@ -817,7 +817,7 @@
 
         # add login to employee table if it does not exist
         my $login = $self->{login};
-        $login =~ s/@.*//;
+        #$login =~ s/@.*//;
         my $sth = $dbh->prepare("SELECT id FROM employee WHERE login = ?;");
         $sth->execute($login);
 

Modified: branches/1.2/Makefile.PL
===================================================================
--- branches/1.2/Makefile.PL	2011-06-18 22:15:10 UTC (rev 3284)
+++ branches/1.2/Makefile.PL	2011-06-19 00:49:43 UTC (rev 3285)
@@ -28,6 +28,8 @@
 requires 'Config::Std';
 requires 'MIME::Lite';
 
+recommends 'perl-Math-BigInt-GMP';
+
 build_requires 'Test::More';
 
 feature 'POS module credit card processing support',

Modified: branches/1.2/dists/rpm/build.sh
===================================================================
--- branches/1.2/dists/rpm/build.sh	2011-06-18 22:15:10 UTC (rev 3284)
+++ branches/1.2/dists/rpm/build.sh	2011-06-19 00:49:43 UTC (rev 3285)
@@ -6,4 +6,4 @@
 
 rpmbuild -ba dists/rpm/ledgersmb.spec
 
-mv /usr/src/redhat/RPMS/noarch/ledgersmb* ../release
+mv /root/rpmbuild/SOURCES/ledgersmb* ../release

Modified: branches/1.2/dists/rpm/ledgersmb.spec
===================================================================
--- branches/1.2/dists/rpm/ledgersmb.spec	2011-06-18 22:15:10 UTC (rev 3284)
+++ branches/1.2/dists/rpm/ledgersmb.spec	2011-06-19 00:49:43 UTC (rev 3285)
@@ -1,4 +1,4 @@
-# RPM spec written for and tested on Fedora Core 6
+# RPM spec written for and tested on Fedora Core 13
 Summary: LedgerSMB - Open Source accounting software
 Name: ledgersmb
 Version: 1.2.22
@@ -7,14 +7,13 @@
 URL: http://www.ledgersmb.org/
 Group: Applications/Productivity
 Source0: %{name}-%{version}.tar.gz
-Source1: Class-Std-v0.0.8.tar.gz
-Source2: Config-Std-v0.0.4.tar.gz
-Source3: Locale-Maketext-Lexicon-0.62.tar.gz
+Source1: Config-Std-0.007.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Requires: perl >= 5.8, httpd, postgresql >= 8.1, tetex-latex
 Requires: perl-DBD-Pg, perl-DBI >= 1.48, perl-version, perl-Smart-Comments
-Requires: perl-MIME-Lite
+Requires: perl-MIME-Lite, perl-Class-Std, perl-Locale-Maketext-Lexicon
+Requires: perl-Math-BigInt-GMP
 BuildRequires: perl
 # avoid bogus autodetection of perl modules:
 AutoReqProv: no
@@ -58,8 +57,6 @@
 mkdir .tmperl
 cd .tmperl
 tar xzf %SOURCE1
-tar xzf %SOURCE2
-tar xzf %SOURCE3
 mv */lib/* ..
 cd ..
 
@@ -98,7 +95,7 @@
 # install relevant parts in data/cgi directory
 cp -rp *.pl favicon.ico index.html ledger-smb.eps ledger-smb.gif ledger-smb.png ledger-smb_small.png menu.ini \
   bin LedgerSMB sql utils locale drivers \
-  Config Class Locale \
+  Config\
   $RPM_BUILD_ROOT%{_datadir}/%{name}/
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/legacy
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.