X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rpm%2Ffreeside.spec;h=77b506147a84966fcf295b20e1299a2c1e58e152;hp=4a65c3e223d54a73d03120fe08db5036327299f4;hb=8cfaefbde2841c7c56b234220490d778ede17a6a;hpb=85b7bb9e4a45319c13fa1de86e792c661714d384 diff --git a/rpm/freeside.spec b/rpm/freeside.spec index 4a65c3e22..77b506147 100644 --- a/rpm/freeside.spec +++ b/rpm/freeside.spec @@ -1,6 +1,6 @@ %{!?_initrddir:%define _initrddir /etc/rc.d/init.d} %{!?version:%define version 1.9} -%{!?release:%define release 4} +%{!?release:%define release 6} Summary: Freeside ISP Billing System Name: freeside @@ -27,13 +27,16 @@ Requires: perl-Fax-Hylafax-Client %define apache_confdir /etc/httpd/conf.d %define apache_version 2 %define freeside_document_root /var/www/freeside +%define freeside_selfservice_document_root /var/www/freeside-selfservice %else %define apache_conffile /etc/apache2/uid.conf %define apache_confdir /etc/apache2/conf.d %define apache_version 2 %define freeside_document_root /srv/www/freeside +%define freeside_selfservice_document_root /srv/www/freeside-selfservice %endif -%define freeside_cache /var/cache/subsys/freeside +# Can change this back to /var/cache/subsys/freeside when cache relocation is fixed and released +%define freeside_cache /etc/freeside %define freeside_conf /etc/freeside %define freeside_export /etc/freeside %define freeside_lock /var/lock/freeside @@ -46,6 +49,7 @@ Requires: perl-Fax-Hylafax-Client %define db_types Pg mysql %define _rpmlibdir /usr/lib/rpm +%define rpmfiles rpm %description Freeside is a flexible ISP billing system written by Ivan Kohler @@ -58,7 +62,6 @@ Prefix: %{freeside_document_root} Requires: mod_ssl %endif Requires: perl-Apache-DBI -Conflicts: %{name}-apacheasp Provides: %{name}-frontend = %{version} BuildArch: noarch @@ -97,7 +100,6 @@ Please note that this RPM does not create the database or database user; it only %package selfservice Summary: Self-service interface for %{name} Group: Applications/Internet -Conflicts: %{name} Requires: %{name}-selfservice-cgi %description selfservice @@ -107,7 +109,6 @@ For security reasons, it is set to conflict with %{name} as you should not insta %package selfservice-core Summary: Core Perl libraries for the self-service interface for %{name} Group: Applications/Internet -Conflicts: %{name} %description selfservice-core This package installs the Perl modules and client daemon for the self-service interface for %{name}. It does not install the CGI interface and can be used with a different front-end. @@ -116,9 +117,8 @@ For security reasons, it is set to conflict with %{name} as you should not insta %package selfservice-cgi Summary: CGI scripts for the self-service interface for %{name} Group: Applications/Internet -Conflicts: %{name} Requires: %{name}-selfservice-core -Prefix: %{freeside_document_root}/selfservice +Prefix: %{freeside_selfservice_document_root} %description selfservice-cgi This package installs the CGI scripts for the self-service interface for %{name}. The scripts use some core libraries packaged in a separate RPM. @@ -127,8 +127,7 @@ For security reasons, it is set to conflict with %{name} as you should not insta %package selfservice-php Summary: Sample PHP files for the self-service interface for %{name} Group: Applications/Internet -Conflicts: %{name} -Prefix: %{freeside_document_root}/selfservice +Prefix: %{freeside_selfservice_document_root} %description selfservice-php This package installs the sample PHP scripts for the self-service interface for %{name}. @@ -138,7 +137,8 @@ For security reasons, it is set to conflict with %{name} as you should not insta %setup -q %{__rm} bin/pod2x # Only useful to Ivan Kohler now perl -pi -e 's|/usr/local/bin|%{_bindir}|g' FS/Makefile.PL -perl -pi -e 's|\s+-o\s+freeside\s+| |g' Makefile +# RPM handles changing file ownership, so Makefile shouldn't +perl -pi -e 's/\s+-o\s+(freeside|root)(\s+-g\s+\$\{\w+\})?\s+/ /g' Makefile perl -ni -e 'print if !/\s+chown\s+/;' Makefile # Fix-ups for self-service. Should merge this into Makefile @@ -229,21 +229,14 @@ touch docs # Install the init script %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir} -%{__install} init.d/freeside-init $RPM_BUILD_ROOT%{_initrddir}/%{name} -#%{__make} install-init INSTALLGROUP=root INIT_FILE=$RPM_BUILD_ROOT%{_initrddir}/%{name} +%{__make} install-init INSTALLGROUP=root INIT_FILE=$RPM_BUILD_ROOT%{_initrddir}/%{name} QUEUED_USER=%{fs_queue_user} SELFSERVICE_USER=%{fs_selfservice_user} SELFSERVICE_MACHINES= INIT_INSTALL= %{__perl} -pi -e "\ - s/%%%%%%QUEUED_USER%%%%%%/%{fs_queue_user}/g;\ - s/%%%%%%SELFSERVICE_USER%%%%%%/%{fs_selfservice_user}/g;\ - s/%%%%%%SELFSERVICE_MACHINES%%%%%%//g;\ s|/etc/default|/etc/sysconfig|g;\ " $RPM_BUILD_ROOT%{_initrddir}/%{name} # Install the HTTPD configuration snippet for HTML::Mason %{__mkdir_p} $RPM_BUILD_ROOT%{apache_confdir} %{__make} install-apache FREESIDE_DOCUMENT_ROOT=%{freeside_document_root} RT_ENABLED=%{rt_enabled} APACHE_CONF=$RPM_BUILD_ROOT%{apache_confdir} APACHE_VERSION=%{apache_version} FREESIDE_CONF=%{freeside_conf} MASON_HANDLER=%{freeside_conf}/handler.pl -%{__perl} -pi -e "s|%%%%%%FREESIDE_DOCUMENT_ROOT%%%%%%|%{freeside_document_root}|g" $RPM_BUILD_ROOT%{apache_confdir}/freeside-*.conf -%{__perl} -pi -e "s|%%%%%%MASON_HANDLER%%%%%%|%{freeside_conf}/handler.pl|g" $RPM_BUILD_ROOT%{apache_confdir}/freeside-*.conf -%{__perl} -pi -e "s|/usr/local/etc/freeside|%{freeside_conf}|g" $RPM_BUILD_ROOT%{apache_confdir}/freeside-*.conf %{__perl} -pi -e 'print "Alias /%{name} %{freeside_document_root}\n\n" if /^/dev/null; then /usr/sbin/useradd freeside @@ -376,8 +373,21 @@ fi %post mason # Make local httpd run with User/Group = freeside if [ -f %{apache_conffile} ]; then +%if "%{_vendor}" != "suse" perl -p -i.fsbackup -e 's/^(User|Group) .*/$1 freeside/' %{apache_conffile} +%else + perl -p -i.fsbackup -e 's/^(User) .*/$1 freeside/' %{apache_conffile} +%endif fi +# Fix up environment so pslatex will run +%if "%{_vendor}" == "suse" +if ! %{__grep} TEXINPUTS /etc/profile.local >/dev/null; then + echo "unset TEXINPUTS" >>/etc/profile.local +fi +if ! %{__grep} TEXINPUTS /etc/init.d/apache2 >/dev/null; then + perl -p -i.fsbackup -e 'print "unset TEXINPUTS\n\n" if /^httpd_conf\s*=\s*/;' /etc/init.d/apache2 +fi +%endif %clean %{__rm} -rf %{buildroot} @@ -403,6 +413,7 @@ fi %files selfservice %defattr(-, freeside, freeside, 0644) +%attr(0644,root,root) %config(noreplace) %{apache_confdir}/%{name}-selfservice.conf %files selfservice-core -f fs_selfservice/FS-SelfService/%{name}-%{version}-%{release}-selfservice-core-filelist %defattr(-, freeside, freeside, 0644) @@ -412,14 +423,17 @@ fi %files selfservice-cgi %defattr(-, freeside, freeside, 0644) -%attr(0711,freeside,freeside) %{freeside_document_root}/selfservice/cgi -%attr(0644,freeside,freeside) %{freeside_document_root}/selfservice/templates +%attr(0711,freeside,freeside) %{freeside_selfservice_document_root}/cgi +%attr(0644,freeside,freeside) %{freeside_selfservice_document_root}/templates %files selfservice-php %defattr(-, freeside, freeside, 0644) -%attr(0755,freeside,freeside) %{freeside_document_root}/selfservice/php +%attr(0755,freeside,freeside) %{freeside_selfservice_document_root}/php %changelog +* Mon Dec 22 2008 Richard Siddall - 1.9-5 +- Modifications to make self-service work if you really insist on installing it on the same machine as Freeside + * Tue Dec 9 2008 Richard Siddall - 1.9-4 - Cleaning up after rpmlint