rpms/ircd-hybrid/devel ircd-hybrid.spec,1.16,1.17

[Eric Tanguy (tanguy)]

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15986

Modified Files:
	ircd-hybrid.spec 
Log Message:



Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ircd-hybrid.spec	20 Feb 2008 03:43:35 -0000	1.16
+++ ircd-hybrid.spec	24 Mar 2008 16:19:16 -0000	1.17
@@ -10,7 +10,7 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
@@ -19,7 +19,7 @@
 Patch0:  ircd-hybrid-7.2.0-help.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
-Requires(pre): fedora-usermgmt
+Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
@@ -89,8 +89,11 @@
 
 
 %pre
-%{_sbindir}/fedora-useradd 14 -s /sbin/nologin -M -r -d %{_libdir}/ircd \
-    -c "IRC service account" ircd &>/dev/null || :
+getent group ircd >/dev/null || groupadd -r ircd
+getent passwd ircd >/dev/null || \
+useradd -r -g ircd -d %{_libdir}/ircd -s /sbin/nologin \
+    -c "IRC service account" ircd
+exit 0
 
 %post
 /sbin/chkconfig --add ircd
@@ -126,6 +129,9 @@
 
 
 %changelog
+* Mon Mar 24 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 7.2.3-5
+- Handle user creation like in guideline
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 7.2.3-4
 - Autorebuild for GCC 4.3