rpms/crossfire/devel crossfire.spec,1.6,1.7

[Michael Thomas (wart)]

Author: wart

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

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




Index: crossfire.spec
===================================================================
RCS file: /cvs/extras/rpms/crossfire/devel/crossfire.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- crossfire.spec	18 Jul 2007 04:12:57 -0000	1.6
+++ crossfire.spec	18 Aug 2007 01:55:01 -0000	1.7
@@ -7,10 +7,11 @@
 
 Name: crossfire
 Version: 1.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Server for hosting crossfire games
 Group: Amusements/Games
-License: GPL
+# All files GPLv2+ except server/daemon.c which also has MIT attributions
+License: GPLv2+ and MIT
 URL: http://crossfire.real-time.com
 Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
 Source1: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.arch.tar.gz
@@ -216,12 +217,11 @@
 
 
 %pre
-user_uid=`id -u crossfire 2>/dev/null`
-if [ x"$user_uid" = x ] ; then
-    useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
-            -c 'Crossfire Server' \
-            crossfire >/dev/null || :
-fi
+getent group crossfire >/dev/null || groupadd -r crossfire
+getent passwd crossfire >/dev/null || \
+useradd -r -g crossfire -d %{_datadir}/%{name} -s /sbin/nologin \
+    -c "Useful comment about the purpose of this account" USERNAME
+exit 0
 
 %post
 /sbin/chkconfig --add crossfire
@@ -332,6 +332,10 @@
 
 
 %changelog
+* Fri Aug 17 2007 Wart <wart at kobold.org> 1.10.0-3
+- License tag clarification
+- Update user creation to conform to recently modified guidelines
+
 * Thu Jul 12 2007 Wart <wart at kobold.org> 1.10.0-2
 - Move client images outside of the server data directory.
 - Update selinux policy