[freeside-commits] freeside/rpm freeside.spec,1.9,1.10

[Richard Siddall]

Update of /home/cvs/cvsroot/freeside/rpm
In directory wavetail.420.am:/tmp/cvs-serv19582/freeside-1.9/rpm

Modified Files:
	freeside.spec 
Log Message:
More fixes for SuSE self-service:
1/ Put binaries in the right folder
2/ Make sure freeside group is created
3/ Make sure freeside home directory is created


Index: freeside.spec
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/freeside.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- freeside.spec	28 Jan 2009 16:29:18 -0000	1.9
+++ freeside.spec	16 Apr 2009 03:58:20 -0000	1.10
@@ -144,6 +144,7 @@
 # Fix-ups for self-service.  Should merge this into Makefile
 perl -pi -e 's|/usr/local/sbin|%{_sbindir}|g' FS/bin/freeside-selfservice-server
 perl -pi -e 's|/usr/local/bin|%{_bindir}|g' fs_selfservice/FS-SelfService/Makefile.PL
+perl -pi -e 's|/usr/local/sbin|%{_sbindir}|g' fs_selfservice/FS-SelfService/Makefile.PL
 perl -pi -e 's|/usr/local/freeside|%{freeside_socket}|g' fs_selfservice/FS-SelfService/*.pm
 perl -pi -e 's|socket\s*=\s*"/usr/local/freeside|socket = "%{freeside_socket}|g' fs_selfservice/FS-SelfService/freeside-selfservice-*
 perl -pi -e 's|log_file\s*=\s*"/usr/local/freeside|log_file = "%{freeside_log}|g' fs_selfservice/FS-SelfService/freeside-selfservice-*
@@ -329,27 +330,42 @@
 
 %pre
 if ! %{__id} freeside &>/dev/null; then
-	/usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+	/usr/sbin/groupadd freeside
+%endif
+	/usr/sbin/useradd -m freeside
 fi
 
 %pre mason
 if ! %{__id} freeside &>/dev/null; then
-	/usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+	/usr/sbin/groupadd freeside
+%endif
+	/usr/sbin/useradd -m freeside
 fi
 
 %pre postgresql
 if ! %{__id} freeside &>/dev/null; then
-	/usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+	/usr/sbin/groupadd freeside
+%endif
+	/usr/sbin/useradd -m freeside
 fi
 
 %pre mysql
 if ! %{__id} freeside &>/dev/null; then
-	/usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+	/usr/sbin/groupadd freeside
+%endif
+	/usr/sbin/useradd -m freeside
 fi
 
 %pre selfservice-cgi
 if ! %{__id} freeside &>/dev/null; then
-	/usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+	/usr/sbin/groupadd freeside
+%endif
+	/usr/sbin/useradd -m freeside
 fi
 
 %post