rpms/cyrus-sasl/F-13 cyrus-sasl.spec,1.89,1.90

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27061

Modified Files:
	cyrus-sasl.spec 
Log Message:
Update pre post preun and postun scripts


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-13/cyrus-sasl.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- cyrus-sasl.spec	22 Feb 2010 11:35:05 -0000	1.89
+++ cyrus-sasl.spec	13 Mar 2010 08:14:13 -0000	1.90
@@ -9,7 +9,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -311,24 +311,28 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/sas
 test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
 
 %pre
-%__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 || :
+getent group %{username} >/dev/null || groupadd -r %{username}
+getent passwd %{username} >/dev/null || \
+useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \
+-c \"%{hint}\" %{username}
+exit 0
 
 %post
 /sbin/chkconfig --add saslauthd
+exit 0
 
 %preun
 if [ $1 -eq 0 ] ; then
         /sbin/service saslauthd stop 2>&1 > /dev/null
         /sbin/chkconfig --del saslauthd
 fi
+exit 0
 
 %postun
 if [ $1 -ne 0 ] ; then
         /sbin/service saslauthd condrestart 2>&1 > /dev/null
 fi
-%__fe_userdel %{username} >/dev/null 2>&1 || :
-%__fe_groupdel %{username} >/dev/null 2>&1 || :
+exit 0
 
 %post lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -395,6 +399,9 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Mar 11 2010 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-10
+- Update pre post preun and postun scripts
+
 * Mon Feb 22 2010 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-9
 - solve race condition (#566875)