rpms/jabberd/devel jabberd.spec,1.17,1.18

[Adrian Reber (adrian)]

Author: adrian

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

Modified Files:
	jabberd.spec 
Log Message:
* Mon Aug 27 2007 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.14
- applied patch to fix bz #175219
- removed config flag for startup script
- updated License



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/jabberd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jabberd.spec	12 Jun 2007 08:34:38 -0000	1.17
+++ jabberd.spec	27 Aug 2007 14:01:56 -0000	1.18
@@ -1,8 +1,8 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.0
-Release: 0.s11.13%{?dist}
-License: GPL
+Release: 0.s11.14%{?dist}
+License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
 Source1: jabberd
@@ -117,7 +117,11 @@
 
 %pre
 #creating jabber user
-useradd -r -d %{_var}/lib/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:
+getent group jabber >/dev/null || groupadd -r jabber
+getent passwd jabber >/dev/null || \
+useradd -r -g jabber -d %{_var}/lib/%{name} -s /sbin/nologin \
+	-c "Jabber Server" jabber
+exit 0
 
 
 %post
@@ -170,13 +174,18 @@
 %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/templates/*xml*
 %{_datadir}/man/man8/*
 %{_datadir}/%{name}/
-%config %{_initrddir}/%{name}
+%{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/jabberd
 %config(noreplace) %{_sysconfdir}/sysconfig/jabberd
-%attr(-,jabber,jabber) %{_var}/lib/jabberd
+%attr(-, jabber, jabber) %{_var}/lib/jabberd
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Mon Aug 27 2007 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.14
+- applied patch to fix bz #175219
+- removed config flag for startup script
+- updated License
+
 * Thu Jun 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis.info> - 2.0-0.s11.13
 - rebuilt on behalf of Adrian