From a73b9353fc172352d8b9509f2ae81d6b30c60d72 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Apr 28 2011 14:48:02 +0000
Subject: Disable the use of systemd for the initscripts


389-ds-base uses service in a problematic way:
       service SCRIPT COMMAND [OPTIONS]
The initscript use the optional [OPTIONS] as the name of the instance
to operate on.  However, the systemd initscript wrapper in f15 does
not interpret this correctly.  So for now, in f15, just disable the
use of the systemd wrapper.

---

diff --git a/389-ds-base.spec b/389-ds-base.spec
index b7a8683..377786e 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -16,7 +16,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.8.2
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -91,6 +91,7 @@ Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz
 # 389-ds-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Source2:          %{name}-devel.README
+Patch0:           f15-disable-systemd.patch
 
 %description
 389 Directory Server is an LDAPv3 compliant server.  The base package includes
@@ -138,6 +139,7 @@ Development Libraries and headers for the 389 Directory Server base package.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerel}
+%patch0 -p1
 cp %{SOURCE2} README.devel
 
 %build
@@ -278,6 +280,9 @@ exit 0
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Wed Apr 27 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.8.2-2
+- explicitly disable the use of systemd
+
 * Thu Apr 14 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.8.2-1
 - 389-ds-base-1.2.8.2
 - Bug 696407 - If an entry with a mixed case RDN is turned to be
diff --git a/f15-disable-systemd.patch b/f15-disable-systemd.patch
new file mode 100644
index 0000000..5445829
--- /dev/null
+++ b/f15-disable-systemd.patch
@@ -0,0 +1,24 @@
+--- a/wrappers/initscript.in
++++ b/wrappers/initscript.in
+@@ -10,6 +10,9 @@
+ # datadir:     @localstatedir@/lib/@package_name@/slapd-<instance name>
+ #
+ 
++# Avoid using systemd for now
++SYSTEMCTL_SKIP_REDIRECT=1 ; export SYSTEMCTL_SKIP_REDIRECT
++
+ # Source function library.
+ if [ -f /etc/rc.d/init.d/functions ] ; then
+ . /etc/rc.d/init.d/functions
+--- a/wrappers/ldap-agent-initscript.in
++++ b/wrappers/ldap-agent-initscript.in
+@@ -9,6 +9,9 @@
+ # pidfile:     @localstatedir@/run/ldap-agent.pid
+ #
+ 
++# Avoid using systemd for now
++SYSTEMCTL_SKIP_REDIRECT=1 ; export SYSTEMCTL_SKIP_REDIRECT
++
+ # Source function library.
+ if [ -f /etc/rc.d/init.d/functions ] ; then
+ . /etc/rc.d/init.d/functions