From bc95575bf53f74d3196619fc05f39332e7d731c7 Mon Sep 17 00:00:00 2001
From: Lubos Uhliarik <luhliari@redhat.com>
Date: Thu, 2 May 2019 14:46:02 +0000
Subject: [PATCH] httpd dependency on initscripts is unspecified (#1705188)

- substitute "service" cmd by "httpd" with -t arg

Resolves: #1705188
---
 apachectl.sh | 3 ++-
 httpd.spec   | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apachectl.sh b/apachectl.sh
index ee2dba8..77868fe 100755
--- a/apachectl.sh
+++ b/apachectl.sh
@@ -22,6 +22,7 @@ fi
 ACMD="$1"
 ARGV="$@"
 SVC='httpd.service'
+HTTPD='@HTTPDBIN@'
 
 if [ "x$2" != "x" ] ; then
     echo Passing arguments to httpd using apachectl is no longer supported.
@@ -49,7 +50,7 @@ graceful-stop)
     ERROR=$?
     ;;
 configtest)
-    /usr/sbin/service ${SVC/.service//} $ACMD
+    $HTTPD -t
     ERROR=$?
     ;;
 *)
diff --git a/httpd.spec b/httpd.spec
index cdd7ff1..00094c6 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,7 +13,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.39
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -414,6 +414,9 @@ sed -i \
     s,@@Port@@,80,;" \
     docs/conf/extra/*.conf
 
+# Set correct path for httpd binary in apachectl script
+sed -i 's,@HTTPDBIN@,%{_sbindir}/httpd,g' $RPM_SOURCE_DIR/apachectl.sh
+
 # Create cache directory
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
          $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
@@ -734,6 +737,9 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Thu May 02 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-4
+- httpd dependency on initscripts is unspecified (#1705188)
+
 * Tue Apr  9 2019 Joe Orton <jorton@redhat.com> - 2.4.39-3
 - fix statedir symlink to point to /var/lib/httpd (#1697662)
 - mod_reqtimeout: fix default values regression (PR 63325)