rpms/liquidwar/devel liquidwar.spec,1.2,1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5010

Modified Files:
	liquidwar.spec 
Log Message:
* Thu Nov 23 2006 Wart <wart at kobold.org> 5.6.3-2
- Added init.d startup and logrotate scripts for the game server
- Put the game server in its own subpackage



Index: liquidwar.spec
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/devel/liquidwar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- liquidwar.spec	24 Nov 2006 06:52:00 -0000	1.2
+++ liquidwar.spec	24 Nov 2006 09:56:15 -0000	1.3
@@ -13,11 +13,6 @@
 BuildRequires:  allegro-devel allegro-tools tetex-latex python texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Requires(post): /sbin/chkconfig
-Requires(post): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
 
 %description
 Liquid War is a unique multiplayer wargame. You control an army of liquid
@@ -35,10 +30,16 @@
 This package contains the documentation of LiquidWar in html, pdf, ps and txt
 format.
 
+
 %package server
 Summary:        Network game server for the LiquidWar game
 Group:          Amusements/Games
 Requires:       %{name} = %{version}-%{release}
+Requires(pre):  /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig /sbin/service
+Requires(postun): /sbin/service
+
 %description server
 This package contains the server for hosting network LiquidWar games.
 
@@ -98,6 +99,7 @@
 install -p -D -m 644 %{SOURCE3} \
         $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -120,10 +122,11 @@
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+
 %pre server
 user_uid=`id -u %{name} 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
+    /usr/sbin/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
             -c 'LiquidWar Server' \
             %{name} >/dev/null || :
 fi
@@ -169,7 +172,8 @@
 
 %changelog
 * Thu Nov 23 2006 Wart <wart at kobold.org> 5.6.3-2
-- Added init.d startup script for the game server
+- Added init.d startup and logrotate scripts for the game server
+- Put the game server in its own subpackage
 
 * Sun Nov 19 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.6.3-1
 - Initial Fedora Extras package