[openldap] openldap-servers scriptlets require initscripts package

jvcelak jvcelak at fedoraproject.org
Mon Jun 27 17:05:02 UTC 2011


commit cea83df834cff06979ebfd2b78a5334f624c6c38
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Mon Jun 27 14:24:14 2011 +0200

    openldap-servers scriptlets require initscripts package
    
    Resolves: #716857

 openldap.spec |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index 5bd9692..bd37689 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -70,9 +70,9 @@ customized LDAP clients.
 Summary: LDAP server
 License: OpenLDAP
 Requires: openldap = %{version}-%{release}, openssl
-Requires(pre): shadow-utils
-Requires(post): chkconfig, /sbin/runuser, make
-Requires(preun): chkconfig
+Requires(pre): shadow-utils, initscripts
+Requires(post): chkconfig, /sbin/runuser, make, initscripts
+Requires(preun): chkconfig, initscripts
 BuildRequires: libdb-devel >= 5.0, libdb-devel < 5.2
 Group: System Environment/Daemons
 
@@ -388,9 +388,9 @@ if [ $1 -eq 2 ]; then
 		pushd %{_sharedstatedir}/ldap &>/dev/null
 
 		# stop the service
-		if service slapd status &>/dev/null; then
+		if /sbin/service slapd status &>/dev/null; then
 			touch need_start
-			service slapd stop
+			/sbin/service slapd stop
 		else
 			rm -f need_start
 		fi
@@ -503,7 +503,7 @@ fi
 # restart after upgrade
 if [ $1 -ge 1 ]; then
 	if [ -f %{_sharedstatedir}/ldap/need_start ]; then
-		service slapd start
+		/sbin/service slapd start
 		rm -f %{_sharedstatedir}/ldap/need_start
 	else
 		/sbin/service slapd condrestart
@@ -537,9 +537,9 @@ if [ $2 -eq 2 ]; then
 	# we are interested in minor version changes (both versions of db4 are installed at this moment)
 	if [ "$(rpm -q --qf="%%{version}\n" db4 | sed 's/\.[0-9]*$//' | sort -u | wc -l)" != "1" ]; then
 		# stop the service
-		if service slapd status &>/dev/null; then
+		if /sbin/service slapd status &>/dev/null; then
 			touch need_start
-			service slapd stop
+			/sbin/service slapd stop
 		fi
 
 		# ensure the database is consistent
@@ -570,7 +570,7 @@ if [ -f %{_sharedstatedir}/ldap/upgrade_db4 ]; then
 
 	# start the service
 	if [ -f need_start ]; then
-		service slapd start
+		/sbin/service slapd start
 		rm -f need_start
 	fi
 
@@ -655,6 +655,7 @@ exit 0
 - change default database type from BDB to HDB
 - enable ldapi:/// interface by default
 - set cn=config management ACLs for root user, SASL external schema (#712495)
+- fix: server scriptlets require initscripts package (#716857)
 
 * Fri Mar 18 2011 Jan Vcelak <jvcelak at redhat.com> 2.4.24-2
 - new: system resource limiting for slapd using ulimit


More information about the scm-commits mailing list