SPECS: quake3-gpl.spec - restored user/group add/remove but only f...

[paszczus]

Author: paszczus                     Date: Fri Oct 14 13:24:04 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- restored user/group add/remove but only for -server
- cleanup
- release 0.4

---- Files affected:
SPECS:
   quake3-gpl.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/quake3-gpl.spec
diff -u SPECS/quake3-gpl.spec:1.9 SPECS/quake3-gpl.spec:1.10
--- SPECS/quake3-gpl.spec:1.9	Fri Oct 14 08:51:17 2005
+++ SPECS/quake3-gpl.spec	Fri Oct 14 15:23:59 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Quake3 dla Linuksa
 Name:		quake3-gpl
 Version:	1.33
-Release:	0.3
+Release:	0.4
 License:	GPL
 Group:		Applications/Games
 Source0:	quake3-%{version}_SVN156M.tar.bz2
@@ -21,14 +21,12 @@
 BuildRequires:	SDL-devel
 BuildRequires:	byacc
 BuildRequires:  rpmbuild(macros) >= 1.202
-%if 0
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
-%endif
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	OpenGL
@@ -104,7 +102,6 @@
 CFLAGS="$CFLAGS -DUSE_SDL=1 $(sdl-config --cflags)"
 CFLAGS="$CFLAGS -DNDEBUG -MMD"
 CFLAGS="$CFLAGS -DHAVE_VM_NATIVE"
-#ifarch %{ix86} ppc
 %ifarch %{ix86}
 CFLAGS="$CFLAGS -DHAVE_VM_COMPILED"
 %endif
@@ -136,12 +133,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if 0
-%pre common
-%groupadd -P %{name}-common -g 38 quake3
-%useradd -P %{name}-common -u 124 -d %{_gamedir} -s /bin/bash -c "Quake ]|[ Arena" -g quake3 quake3
-%endif
-
 %post common
 if [ "$1" = "1" ]; then
 	echo ""
@@ -151,6 +142,10 @@
 	echo ""
 fi
 
+%pre server
+%groupadd -P %{name}-common -g 38 quake3
+%useradd -P %{name}-common -u 124 -d %{_datadir}/%{name}} -s /bin/bash -c "Quake ]|[ Arena" -g quake3 quake3
+
 %post server
 /sbin/chkconfig --add q3ded
 if [ -f /var/lock/subsys/q3ded ]; then
@@ -167,14 +162,11 @@
 	/sbin/chkconfig --del q3ded
 fi
 
-%if 0
-%postun common
+%postun server
 if [ "$1" = "0" ]; then
-	%userremove quake3
-	%groupremove quake3
+        %userremove quake3
+        %groupremove quake3
 fi
-%endif
-
 
 %files
 %defattr(644,root,root,755)
@@ -207,6 +199,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/10/14 13:23:59  paszczus
+- restored user/group add/remove but only for -server
+- cleanup
+- release 0.4
+
 Revision 1.9  2005/10/14 06:51:17  paszczus
 - fixed build on ppc (is it right way?)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/quake3-gpl.spec?r1=1.9&r2=1.10&f=u