[openldap/f15] openldap-servers scriptlets require initscripts package

jvcelak jvcelak at fedoraproject.org
Tue Jun 28 09:27:17 UTC 2011


commit a07f61b0c4c2ec14dc29efdfcb11d9fe087b719c
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 |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index a95153d..e86276a 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -73,9 +73,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: db4-devel >= 4.4, db4-devel < 4.9
 Group: System Environment/Daemons
 
@@ -401,9 +401,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
@@ -527,7 +527,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
@@ -561,9 +561,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
@@ -594,7 +594,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
 


More information about the scm-commits mailing list