From c32ef215aad7922fe5b56fa6a05c6813683fcbde Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 28 Jan 2012 10:10:49 +0100 Subject: [PATCH] apache-mpm-event: fixed Conflicts in systemd unit. --- srcpkgs/apache-mpm-event/files/apache-mpm-event.service | 2 +- srcpkgs/apache-mpm-event/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/apache-mpm-event/files/apache-mpm-event.service b/srcpkgs/apache-mpm-event/files/apache-mpm-event.service index cda2f7eafc5..98ccdf33351 100644 --- a/srcpkgs/apache-mpm-event/files/apache-mpm-event.service +++ b/srcpkgs/apache-mpm-event/files/apache-mpm-event.service @@ -1,7 +1,7 @@ [Unit] Description=The Apache HTTP Server (Event MPM) After=syslog.target network.target remote-fs.target -Conflicts=apache.target apache-mpm-worker.target +Conflicts=apache.service apache-mpm-worker.service [Service] Type=forking diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template index 1e097ac835d..84345ab1ef0 100644 --- a/srcpkgs/apache-mpm-event/template +++ b/srcpkgs/apache-mpm-event/template @@ -10,7 +10,7 @@ unset post_install pre_configure run_depends # Override some vars. pkgname=apache-mpm-event configure_args="${configure_args} --enable-modules= --prefix=/usr --with-mpm=event" -revision=2 +revision=3 short_desc="Apache HTTP Server - event driven model" long_desc=" Each Apache Multi-Processing Module provides a different flavor of web @@ -42,5 +42,5 @@ post_install() { cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc} rm -rf ${DESTDIR}/* vinstall httpd 755 usr/sbin httpd.event - vinstall ${FILESDIR}/apache-mpm-event.service 644 lib/systemd/system + vinstall ${FILESDIR}/${pkgname}.service 644 lib/systemd/system }