summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsiddall <rsiddall>2007-11-13 19:39:19 +0000
committerrsiddall <rsiddall>2007-11-13 19:39:19 +0000
commitf3c77a2dc43fc5db9c368ec618d7ece5e300ac3a (patch)
treecd7ac77ae6a3bc8f546cd5176bc82337145ea980
parent50d078d125c7267d17d02d3ea28a34d1a446c99d (diff)
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.
-rw-r--r--install/rpm/freeside.spec13
1 files changed, 12 insertions, 1 deletions
diff --git a/install/rpm/freeside.spec b/install/rpm/freeside.spec
index c28b07e01..49b8420eb 100644
--- a/install/rpm/freeside.spec
+++ b/install/rpm/freeside.spec
@@ -17,6 +17,7 @@ BuildArch: noarch
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 @@ Summary: HTML::Mason interface for %{name}
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 @@ if ! %{__id} freeside &>/dev/null; then
/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}