rpms/openldap/FC-5 openldap.spec,1.55,1.56

[fedora-cvs-commits at redhat.com]

Author: jsafrane

Update of /cvs/dist/rpms/openldap/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32325

Modified Files:
	openldap.spec 
Log Message:
Do not delete database in %preun if there is update in progress (bz#230959)



Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-5/openldap.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- openldap.spec	28 Nov 2006 20:49:28 -0000	1.55
+++ openldap.spec	23 Apr 2007 06:51:58 -0000	1.56
@@ -600,21 +600,20 @@
 if [ "$1" = "0" ] ; then
 	/sbin/service ldap stop > /dev/null 2>&1 || :
 	/sbin/chkconfig --del ldap
-fi
-# See if slapd has been configured and (ever) started
-files=$(echo /var/lib/ldap/{[a]lock,*.bdb,*.dbd,log.*,__db.*})
-if [ "$files" != '/var/lib/ldap/[a]lock /var/lib/ldap/*.bdb /var/lib/ldap/*.dbd /var/lib/ldap/log.* /var/lib/ldap/__db.*' ] ; then
-	# Save an ldif of the database where the "% post servers" scriptlet can
-	# restore it.  Also save the database files to a "rpmorig" directory
-	# Just In Case (TM)
-	if /sbin/runuser -m -s /usr/sbin/slapcat -- ldap -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
-		if [ -s /var/lib/ldap/upgrade.ldif ] ; then
-			/bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
-			mkdir /var/lib/ldap/rpmorig
-			mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
-			cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
-		else
-			/bin/rm -f /var/lib/ldap/upgrade.ldif
+	# See if slapd has been configured and (ever) started
+	files=$(echo /var/lib/ldap/{[a]lock,*.bdb,*.dbd,log.*,__db.*})
+	if [ "$files" != '/var/lib/ldap/[a]lock /var/lib/ldap/*.bdb /var/lib/ldap/*.dbd /var/lib/ldap/log.* /var/lib/ldap/__db.*' ] ; then
+		# Save an ldif of the database.  Also save the database files to a "rpmorig" directory
+		# Just In Case (TM)
+		if /sbin/runuser -m -s /usr/sbin/slapcat -- ldap -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
+			if [ -s /var/lib/ldap/upgrade.ldif ] ; then
+				/bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+				mkdir /var/lib/ldap/rpmorig
+				mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+				cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+			else
+				/bin/rm -f /var/lib/ldap/upgrade.ldif
+			fi
 		fi
 	fi
 fi