summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Orton <jorton@redhat.com>2017-09-22 08:03:13 +0100
committerJoe Orton <jorton@redhat.com>2017-09-22 08:03:13 +0100
commitccd2dc5050cf444bd10c41d9b5c09e2a897f12a2 (patch)
treed5f7ebba21b3e04f1b9f27c77c6ab3ce7bd56640
parent10a87792e56496e94cd11bcb4d44ee9561f07552 (diff)
downloadhttpd-ccd2dc5050cf444bd10c41d9b5c09e2a897f12a2.tar.gz
httpd-ccd2dc5050cf444bd10c41d9b5c09e2a897f12a2.tar.xz
httpd-ccd2dc5050cf444bd10c41d9b5c09e2a897f12a2.zip
Fix MPM defaults if building on RHEL, fix touch -r for 00-mpm.conf.
-rw-r--r--httpd.spec4
1 files changed, 2 insertions, 2 deletions
diff --git a/httpd.spec b/httpd.spec
index 65884a8..16c9dde 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -4,7 +4,7 @@
%define mmn 20120211
%define mmnisa %{mmn}%{__isa_name}%{__isa_bits}
%define vstring %(source /etc/os-release; echo ${REDHAT_SUPPORT_PRODUCT})
-%if 0%{?fedora} < 27
+%if 0%{?fedora} < 27 || %{?rhel} <= 7
%global mpm prefork
%else
%global mpm event
@@ -329,7 +329,7 @@ done
sed -i '/^#LoadModule mpm_%{mpm}_module /s/^#//' \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
-touch -r $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf \
+touch -r $RPM_SOURCE_DIR/00-mpm.conf \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
# install systemd override drop directory