rpms/cyrus-sasl/devel cyrus-sasl.spec,1.85,1.86

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5098

Modified Files:
	cyrus-sasl.spec 
Log Message:
Create saslauth user according to fedora packaging guide



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- cyrus-sasl.spec	24 Sep 2009 11:32:04 -0000	1.85
+++ cyrus-sasl.spec	16 Oct 2009 17:16:41 -0000	1.86
@@ -1,3 +1,4 @@
+%define uid		50
 %define username	saslauth
 %define hint		"Saslauthd user"
 %define homedir		%{_var}/empty/%{username}
@@ -8,7 +9,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -41,6 +42,7 @@ BuildRequires: autoconf, automake, libto
 BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
 BuildRequires: mysql-devel, postgresql-devel, zlib-devel
 BuildRequires: db4-devel
+BuildRequires: fedora-usermgmt-devel
 %if ! %{bootstrap_cyrus_sasl}
 BuildRequires: openldap-devel
 %endif
@@ -48,8 +50,8 @@ Requires(post): chkconfig, /sbin/service
 Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
 Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
 Requires: /sbin/nologin
-Provides: user(%username) = %hint
-Provides: group(%username) = %hint
+Provides: user(%username) = %uid
+Provides: group(%username) = %uid
 
 
 %description
@@ -303,8 +305,8 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/sas
 test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -r %{username} 2> /dev/null || :
-/usr/sbin/useradd -c \"%{hint}\" -g %{username} -s /sbin/nologin -r -d %{homedir} %{username} 2> /dev/null || :
+%__fe_groupadd %{uid} -r %{username} >/dev/null  2>&1 || :
+%__fe_useradd %{uid} -r -c \"%{hint}\" -g %{username} -s /sbin/nologin -d %{homedir} %{username} >/dev/null 2>&1 || :
 
 %post
 /sbin/chkconfig --add saslauthd
@@ -319,8 +321,8 @@ fi
 if [ $1 -ne 0 ] ; then
         /sbin/service saslauthd condrestart 2>&1 > /dev/null
 fi
-/usr/sbin/userdel %{username}
-/usr/sbin/groupdel %{username}
+%__fe_userdel %{username} >/dev/null 2>&1 || :
+%__fe_groupdel %{username} >/dev/null 2>&1 || :
 
 %post lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -387,6 +389,9 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Oct 16 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-6
+- Create the saslauth user according to fedora packaging guide
+
 * Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-5
 - Repair initscript to make condrestart working properly (#522103)