diff --git a/httpd.spec b/httpd.spec index ab7425b..a92ea18 100644 --- a/httpd.spec +++ b/httpd.spec @@ -54,6 +54,8 @@ Provides: webserver Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa} Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units +Conflicts: systemd < 38 +Conflicts: filesystem < 3 %description The Apache HTTP Server is a powerful, efficient, and extensible @@ -234,17 +236,17 @@ make DESTDIR=$RPM_BUILD_ROOT install popd # install alternative MPMs; executables, man pages, and systemd service files -mkdir -p $RPM_BUILD_ROOT/lib/systemd/system +mkdir -p $RPM_BUILD_ROOT%{_unitdir} for f in %{mpms}; do install -m 755 ${f}/httpd $RPM_BUILD_ROOT%{_sbindir}/httpd.${f} install -m 644 httpd.${f}.8 $RPM_BUILD_ROOT%{_mandir}/man8/httpd.${f}.8 install -p -m 644 httpd-${f}.service \ - $RPM_BUILD_ROOT/lib/systemd/system/httpd-${f}.service + $RPM_BUILD_ROOT%{_unitdir}/httpd-${f}.service done # Default httpd (prefork) service file install -p -m 644 httpd.service \ - $RPM_BUILD_ROOT/lib/systemd/system/httpd.service + $RPM_BUILD_ROOT%{_unitdir}/httpd.service # install conf file/directory mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d @@ -491,7 +493,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/* %exclude %{_mandir}/man8/apxs.8* -/lib/systemd/system/*.service +%{_unitdir}/*.service %files tools %defattr(-,root,root)