rpms/cyrus-sasl/F-12 cyrus-sasl.spec,1.88,1.89

[Jan F. Chadima]

Author: jfch2222

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

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-12/cyrus-sasl.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- cyrus-sasl.spec	11 Mar 2010 10:13:40 -0000	1.88
+++ cyrus-sasl.spec	13 Mar 2010 18:03:58 -0000	1.89
@@ -8,7 +8,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -305,24 +305,28 @@ 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 || :
+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
@@ -389,6 +393,9 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Mar 11 2010 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-8
+- Update pre post preun and postun scripts
+
 * Thu Mar 11 2010 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-7
 - updated the postun script