[freeside-commits] freeside/install/rpm freeside.spec, 1.1.4.5, 1.1.4.6

[Richard Siddall]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	freeside.spec 
Log Message:
Fixed bug where placeholders in freeside-init were not replaced during build.

Index: freeside.spec
===================================================================
RCS file: /home/cvs/cvsroot/freeside/install/rpm/Attic/freeside.spec,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- freeside.spec	10 Jul 2007 14:19:43 -0000	1.1.4.5
+++ freeside.spec	10 Jul 2007 17:05:47 -0000	1.1.4.6
@@ -28,6 +28,9 @@
 %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 @@
 
 # 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 @@
 %{__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.*