diff options
| author | rsiddall <rsiddall> | 2007-07-10 17:05:47 +0000 |
|---|---|---|
| committer | rsiddall <rsiddall> | 2007-07-10 17:05:47 +0000 |
| commit | 2ee1e346e7ef6029184f47165d0711d573f1a2e1 (patch) | |
| tree | 14c7807b7157ab899fa46fd8bb18fe4798706df3 | |
| parent | 0d2f7617b0529c0c02bc63dd33d674465a538300 (diff) | |
Fixed bug where placeholders in freeside-init were not replaced during build.
| -rw-r--r-- | install/rpm/freeside.spec | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/install/rpm/freeside.spec b/install/rpm/freeside.spec index 4b95d0065..2e6a87336 100644 --- a/install/rpm/freeside.spec +++ b/install/rpm/freeside.spec @@ -28,6 +28,9 @@ Requires: tetex-latex %define rt_enabled 0 %define apache_conf /etc/httpd/conf.d %define apache_version 2 +%define fs_queue_user fs_queue +%define fs_selfservice_user fs_selfservice +%define fs_cron_user fs_daily %description Freeside is a flexible ISP billing system written by Ivan Kohler @@ -135,7 +138,13 @@ touch docs # Install the init script %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir} -%{__install} init.d/freeside-init $RPM_BUILD_ROOT%{_initrddir}/freeside +%{__install} init.d/freeside-init $RPM_BUILD_ROOT%{_initrddir}/%{name} +#%{__make} install-init INSTALLGROUP=root INIT_FILE=$RPM_BUILD_ROOT%{_initrddir}/%{name} +%{__perl} -pi -e "\ + s/%%%%%%QUEUED_USER%%%%%%/%{fs_queue_user}/g;\ + s/%%%%%%SELFSERVICE_USER%%%%%%/%{fs_selfservice_user}/g;\ + s/%%%%%%SELFSERVICE_MACHINES%%%%%%//g;\ + " $RPM_BUILD_ROOT%{_initrddir}/%{name} # Install the HTTPD configuration snippet for HTML::Mason %{__mkdir_p} $RPM_BUILD_ROOT%{apache_conf} @@ -218,8 +227,8 @@ fi %{__rm} -rf %{buildroot} %files -f FS/%{name}-%{version}-%{release}-filelist -%attr(0711,root,root) %{_initrddir}/freeside -%attr(0644,root,root) %config(noreplace) /etc/sysconfig/freeside +%attr(0711,root,root) %{_initrddir}/%{name} +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %defattr(-,freeside,freeside,-) %doc README INSTALL CREDITS GPL %attr(-,freeside,freeside) %config(noreplace) %{freeside_conf}/conf.* |