[freeside-commits] freeside/install/rpm freeside.spec, 1.1.4.12, 1.1.4.13

[Richard Siddall]

Update of /home/cvs/cvsroot/freeside/install/rpm
In directory wavetail:/tmp/cvs-serv25527

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	freeside.spec 
Log Message:
Added two optional modules to the Requires lists: Apache::DBI and Fax::Hylafax::Client
Added a %post script to chkconfig the freeside service, but not start it.
Modified the Mason %post script to check the httpd config file is in the expected place.


Index: freeside.spec
===================================================================
RCS file: /home/cvs/cvsroot/freeside/install/rpm/Attic/freeside.spec,v
retrieving revision 1.1.4.12
retrieving revision 1.1.4.13
diff -u -d -r1.1.4.12 -r1.1.4.13
--- freeside.spec	8 Nov 2007 03:04:29 -0000	1.1.4.12
+++ freeside.spec	13 Nov 2007 19:39:19 -0000	1.1.4.13
@@ -17,6 +17,7 @@
 Requires: %{name}-frontend
 Requires: %{name}-backend
 Requires: tetex-latex
+Requires: perl-Fax-Hylafax-Client
 
 %define freeside_document_root	/var/www/freeside
 %define freeside_cache		/var/cache/subsys/freeside
@@ -42,6 +43,7 @@
 Group: Applications/Internet
 Prefix: /var/www/freeside
 Requires: mod_ssl
+Requires: perl-Apache-DBI
 %%include freeside-mason.deps.inc
 Conflicts: %{name}-apacheasp
 Provides: %{name}-frontend
@@ -230,9 +232,18 @@
 	/usr/sbin/useradd freeside
 fi
 
+%post
+if [ -x /sbin/chkconfig ]; then
+	/sbin/chkconfig --add freeside
+fi
+#if [ $1 -eq 2 -a -x /usr/bin/freeside-upgrade ]; then
+#fi
+
 %post mason
 # Make local httpd run with User/Group = freeside
-perl -p -i.fsbackup -e 's/^(User|Group) .*/$1 freeside/' %{apache_conffile}
+if [ -f %{apache_conffile} ]; then
+	perl -p -i.fsbackup -e 's/^(User|Group) .*/$1 freeside/' %{apache_conffile}
+fi
 
 %clean
 %{__rm} -rf %{buildroot}