rpms/otrs/devel otrs.spec,1.7,1.8

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/otrs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15776

Modified Files:
	otrs.spec 
Log Message:
fix license tag


Index: otrs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/otrs/devel/otrs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- otrs.spec	6 Jun 2007 18:56:51 -0000	1.7
+++ otrs.spec	11 Aug 2008 21:16:59 -0000	1.8
@@ -1,8 +1,8 @@
 Summary:	The Open Ticket Request System
 Name:		otrs
 Version:	2.1.7
-Release:	1%{?dist}
-License:	GPL
+Release:	2%{?dist}
+License:	GPLv2+
 Group:		Applications/Internet
 URL: 		http://www.otrs.org/
 Source0:	ftp://ftp.otrs.org/pub/%{name}/%{name}-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildArch: noarch
 Requires: perl-GDGraph
 Requires: mod_perl httpd mysql fetchmail procmail /usr/sbin/sendmail
-Requires(pre):	%{_sbindir}/useradd httpd
+Requires(pre):	shadow-utils httpd
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(post): /sbin/chkconfig /sbin/service
 Requires(postun): /sbin/service
@@ -75,7 +75,10 @@
 rm -rf %{buildroot}/%{otrsdir}/Kernel/cpan-lib/[^H]*
 
 %pre
-%{_sbindir}/useradd -d %{otrsdir} -g apache -c 'OTRS System User' -r -s /sbin/nologin otrs 2> /dev/null || :
+getent passwd otrs >/dev/null || \
+useradd -r -g apache -d %{otrsdir} -s /sbin/nologin \
+-c 'OTRS System User' otrs
+exit 0
 
 %preun
 if [ $1 = 0 ]; then
@@ -117,6 +120,10 @@
 %attr(0660,otrs,apache) %{otrsdir}/.*ail*
 
 %changelog
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.7-2
+- fix license tag
+- fix static uid creation to match UsersAndGroups
+
 * Wed Jun 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.1.7-1
 - Upstream released new version