SF.net SVN: ledger-smb:[5333] trunk

[..hidden..]

Revision: 5333
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5333&view=rev
Author:   einhverfr
Date:     2012-12-11 01:39:15 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Scripts/user.pm
    trunk/dists/rpm/ledgersmb.spec

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/user.pm


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5321
   + /branches/1.3:3711-5332

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-12-10 10:19:31 UTC (rev 5332)
+++ trunk/Changelog	2012-12-11 01:39:15 UTC (rev 5333)
@@ -88,7 +88,12 @@
 * Added demo templates with for invoices with attached images (Chris T)
 * Fixed attached images not appearing in templates (Chris T)
 * Fixed projects not attached to customers lost 1.2-1.3 (Chris T, h/t Ario)
+* Fixed the rpm file to make a valid ledgersmb-httpd.conf (Havard S, 3593393)
+* Dropped seconds/subsecs from password expiration notice (Chris T, 3593963)
 
+Chris T is Chris Travers
+Havard S is Havard Sorli
+
 Changelog for 1.3.25
 * Fixed internal server errors on LedgerSMB->error() during new() (Chris T)
 * Fixed pricematrix rows not showing where pricegroups are used (Chris T)

Modified: trunk/LedgerSMB/Scripts/user.pm
===================================================================
--- trunk/LedgerSMB/Scripts/user.pm	2012-12-10 10:19:31 UTC (rev 5332)
+++ trunk/LedgerSMB/Scripts/user.pm	2012-12-11 01:39:15 UTC (rev 5333)
@@ -58,6 +58,7 @@
 	    format   => 'HTML'
     );
     $user->{user} = $request->{_user};
+    $user->{password_expires} =~ s/:(\d|\.)*$//;
     $template->render($user);
 }
 


Property changes on: trunk/LedgerSMB/Scripts/user.pm
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/1.3/LedgerSMB/Scripts/user.pm:3711-5332
/branches/1.3/scripts/user.pl:3711-5332

Modified: trunk/dists/rpm/ledgersmb.spec
===================================================================
--- trunk/dists/rpm/ledgersmb.spec	2012-12-10 10:19:31 UTC (rev 5332)
+++ trunk/dists/rpm/ledgersmb.spec	2012-12-11 01:39:15 UTC (rev 5333)
@@ -2,7 +2,7 @@
 Summary: LedgerSMB - Open Source accounting software
 Name: ledgersmb
 Version: 1.3.9990305076
-Release: 1
+Release: 2
 License: GPL
 URL: http://www.ledgersmb.org/
 Group: Applications/Productivity
@@ -44,10 +44,12 @@
 local   all         postgres                          ident sameuser
 local   all         all                               md5
 host    all         all         127.0.0.1/32          md5
-- Restart PostgreSQL to apply changes (service postgres restart)
+- Restart PostgreSQL to apply changes (service postgresql restart)
 
 - log in via psql, ALTER USER postgres WITH PASSWORD 'yada';
 
+- reload your Apache config (service httpd reload)
+
 Visit http://localhost/ledgersmb/setup.pl with username postgres and password 
 'yada' and create an application database.  This will also walk you through 
 creating an initial admin user.
@@ -75,9 +77,26 @@
 
 TAK
 
-perl -p -e "s,/some/path/to/ledgersmb,%{_datadir}/%{name},g" ledgersmb-httpd.conf >> rpm-ledgersmb-httpd.conf
+cat << 'HTTPDCONF' > fix-ledgersmb-httpd-conf-template.pl
+LINE: while (defined($_ = <ARGV>)) {
+    s[/ledgersmb WORKING_DIR/][/ledgersmb %{_datadir}/%{name}/]g;
+    s[Directory WORKING_DIR>][Directory %{_datadir}/%{name}>]g;
+    s[Directory WORKING_DIR/users>][Directory %{_datadir}/%{name}/users>]g;
+    s[Directory WORKING_DIR/bin>][Directory %{_datadir}/%{name}/bin>]g;
+    s[Directory WORKING_DIR/utils>][Directory %{_datadir}/%{name}/utils>]g;
+    s[Directory WORKING_DIR/spool>][Directory {_localstatedir}/spool/%{name}>]g;
+    s[Directory WORKING_DIR/templates>][Directory {_localstatedir}/lib/%{name}/templates>]g;
+    s[Directory WORKING_DIR/LedgerSMB>][Directory {_localstatedir}/lib/%{name}/LedgerSMB>]g;
+}
+continue {
+    print $_;
+}
 
+HTTPDCONF
 
+perl fix-ledgersmb-httpd-conf-template.pl ledgersmb-httpd.conf.template >> rpm-ledgersmb-httpd.conf
+
+
 %install
 
 rm -rf $RPM_BUILD_ROOT
@@ -143,6 +162,12 @@
 
 
 %changelog
+# ToDo: SELinux, pos.conf.pl.template, reload of httpd config
+
+* Fri Dec 08 2012 HÃvard SÃrli <..hidden..> - 1.3.25
+- fix missing ledgersmb-httpd.conf.template 
+- add fix-ledgersmb-httpd-conf-template.pl
+
 * Mon Dec 31 2007 Christopher Murtagh <..hidden..> - 1.2.11
 - updating to 1.2.11
 - removing users directory

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