rpms/cyphesis/devel cyphesis.spec,1.10,1.11

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	cyphesis.spec 
Log Message:
License tag clarification; Update user creation to conform to guidelines




Index: cyphesis.spec
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/cyphesis.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cyphesis.spec	20 Jul 2007 20:28:07 -0000	1.10
+++ cyphesis.spec	19 Aug 2007 21:20:49 -0000	1.11
@@ -7,10 +7,11 @@
 
 Name:           cyphesis
 Version:        0.5.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
-License:        GPL
+# Would be GPLv2+, except server/protocol_instructions.h is GPLv2 only.
+License:        GPLv2
 URL:            http://www.worldforge.org
 Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
 Source1:        cyphesis.te
@@ -28,6 +29,7 @@
 BuildRequires:  checkpolicy selinux-policy-devel hardlink
 
 Requires:       postgresql-server
+Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -131,11 +133,11 @@
 make check
 
 %pre
-user_uid=`id -u cyphesis 2>/dev/null`
-if [ x"$user_uid" = x ] ; then
-    useradd  -r -d %{_datadir}/%{name} -M -c 'Cyphesis Game Server' \
-            cyphesis >/dev/null || :
-fi
+getent group cyphesis >/dev/null || groupadd -r cyphesis
+getent passwd cyphesis >/dev/null || \
+       useradd -r -g cyphesis -d %{_datadir}/%{name} -s /sbin/nologin \
+       -c "Useful comment about the purpose of this account" cyphesis
+exit 0
 
 %post
 /sbin/chkconfig --add cyphesis
@@ -219,6 +221,10 @@
 
 
 %changelog
+* Sun Aug 19 2007 Wart <wart at kobold.org> 0.5.13-2
+- License tag clarification
+- Update user creation to conform to guidelines
+
 * Tue Jul 17 2007 Wart <wart at kobold.org> 0.5.13-1
 - Update to 0.5.13