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

[Richard Siddall]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	freeside.spec 
Log Message:
freeside users need home directories for SSH keys.  Lock and log directories were missing from RPM file list.

Index: freeside.spec
===================================================================
RCS file: /home/cvs/cvsroot/freeside/install/rpm/Attic/freeside.spec,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- freeside.spec	9 Jul 2007 03:07:05 -0000	1.1.4.4
+++ freeside.spec	10 Jul 2007 14:19:43 -0000	1.1.4.5
@@ -93,7 +93,7 @@
 %build
 
 # Add freeside user and group if there isn't already such a user
-%{__id} freeside 2>/dev/null >/dev/null || /usr/sbin/useradd -s /bin/sh -r freeside
+%{__id} freeside 2>/dev/null >/dev/null || /usr/sbin/useradd -s /bin/sh freeside
 # False laziness...
 %{__make} htmlman
 echo "Made HTML manuals"
@@ -206,19 +206,19 @@
 
 %pre
 if ! %{__id} freeside &>/dev/null; then
-	/usr/sbin/useradd -r freeside
+	/usr/sbin/useradd freeside
 fi
 
 %pre selfservice
 if ! %{__id} freeside &>/dev/null; then
-	/usr/sbin/useradd -r freeside
+	/usr/sbin/useradd freeside
 fi
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files -f FS/%{name}-%{version}-%{release}-filelist
-/etc/rc.d/init.d/freeside
+%attr(0711,root,root) %{_initrddir}/freeside
 %attr(0644,root,root) %config(noreplace) /etc/sysconfig/freeside
 %defattr(-,freeside,freeside,-)
 %doc README INSTALL CREDITS GPL
@@ -228,6 +228,8 @@
 %attr(-,freeside,freeside) %config(noreplace) %{freeside_export}/export.*
 %attr(-,freeside,freeside) %config(noreplace) %{freeside_conf}/secrets
 %attr(-,freeside,freeside) %dir %{freeside_conf}
+%attr(-,freeside,freeside) %dir %{freeside_lock}
+%attr(-,freeside,freeside) %dir %{freeside_log}
 
 %files mason -f %{name}-%{version}-%{release}-mason-filelist
 %defattr(-, freeside, freeside, 0755)