From 74a4babeac2a6c4e82ba4697f927f397f6a40859 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 22 Sep 2017 08:03:13 +0100 Subject: [PATCH] Fix MPM defaults if building on RHEL, fix touch -r for 00-mpm.conf. --- httpd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httpd.spec b/httpd.spec index b5282ca..b364001 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