rpms/xpilot-ng/devel xpilot-ng.spec,1.11,1.12

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/xpilot-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10691

Modified Files:
	xpilot-ng.spec 
Log Message:
- License tag clarification
- Fix version and category fields in .desktop files
- Use new user creation guidelines




Index: xpilot-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xpilot-ng.spec	23 Feb 2007 18:17:03 -0000	1.11
+++ xpilot-ng.spec	26 Aug 2007 03:18:31 -0000	1.12
@@ -1,4 +1,4 @@
-%define selinux_variants mls strict targeted
+%define selinux_variants targeted
 %define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp)
 
 %define logwatch_root %{_datadir}/logwatch
@@ -7,11 +7,11 @@
 
 Name:           xpilot-ng
 Version:        4.7.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Multiplayer space arcade game
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://xpilot.sourceforge.net
 Source0:        http://dl.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz
 Source1:        xpilot-ng.png
@@ -44,6 +44,7 @@
 %package server
 Summary: Server for hosting xpilot games
 Group: Amusements/Games
+Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -163,12 +164,11 @@
 fi
 
 %pre server
-user_uid=`id -u xpilot 2>/dev/null`
-if [ x"$user_uid" = x ] ; then
-    useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
-            -c 'XPilot Server' \
-            xpilot >/dev/null || :
-fi
+getent group xpilot >/dev/null || groupadd -r xpilot
+getent passwd xpilot >/dev/null || \
+useradd -r -g xpilot -d %{_datadir}/%{name} -s /sbin/nologin \
+    -c "xpilot game server" xpilot
+exit 0
 
 %post server
 /sbin/chkconfig --add xpilot-ng-server
@@ -267,6 +267,12 @@
 %{logwatch_scripts}/shared/applyxpilotdate
 
 %changelog
+* Thu Aug 23 2007 Wart <wart at kobold.org> 4.7.2-13
+- Minor selinux modifications for rawhide
+- License tag clarification
+- Fix version and category fields in .desktop files
+- Use new user creation guidelines
+
 * Fri Feb 23 2007 Wart <wart at kobold.org> 4.7.2-12
 - Update logwatch script with a previously unknown log field