rpms/openldap/devel openldap.spec,1.165,1.166

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16344

Modified Files:
	openldap.spec 
Log Message:
another shot at previous fix


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- openldap.spec	1 Jul 2010 07:49:49 -0000	1.165
+++ openldap.spec	1 Jul 2010 08:57:32 -0000	1.166
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -508,7 +508,6 @@ if [ -f /var/lib/ldap/need_db_upgrade ];
 	if ls /var/lib/ldap/*.bdb > /dev/null 2>&1; then
 		/sbin/runuser -m -s /usr/sbin/slapd_db_upgrade -- "ldap"  -h /var/lib/ldap /var/lib/ldap/*.bdb
 	fi
-    /sbin/runuser -m -s /usr/sbin/slapd_db_upgrade -- "ldap"  -h /var/lib/ldap /var/lib/ldap/*.bdb
     /sbin/runuser -m -s /usr/sbin/slapd_db_checkpoint -- "ldap" -h /var/lib/ldap -1
     rm -f /var/lib/ldap/need_db_upgrade
 fi
@@ -550,6 +549,7 @@ EOF
     chmod -R 000 %{_sysconfdir}/openldap/slapd.d
     chmod -R u+rwX %{_sysconfdir}/openldap/slapd.d
     rm -f %{_sysconfdir}/openldap/slapd.conf
+	rm -f %{_sharedstatedir}/ldap/__db* %{_sharedstatedir}/ldap/alock
 fi
 
 
@@ -655,6 +655,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Jul 01 2010 Jan Zeleny <jzeleny at redhat.com> - 2.4.22-5
+- another shot at previous fix
+
 * Thu Jul 01 2010 Jan Zeleny <jzeleny at redhat.com> - 2.4.22-4
 - fixed issue with owner of /usr/lib/ldap/__db.* (#609523)