[dhcp-forwarder/f18] disabled upstart

ensc ensc at fedoraproject.org
Sun Aug 19 12:42:55 UTC 2012


commit 90cdebeb5d30dd2a83e8c6699605f8dc1865debd
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sun Aug 19 14:39:33 2012 +0200

    disabled upstart

 dhcp-forwarder.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/dhcp-forwarder.spec b/dhcp-forwarder.spec
index 9f3b1e2..c9181d3 100644
--- a/dhcp-forwarder.spec
+++ b/dhcp-forwarder.spec
@@ -11,7 +11,7 @@
 %bcond_with		minit
 %bcond_with		sysv
 %bcond_without		systemd
-%bcond_without		upstart
+%bcond_with		upstart
 ##
 
 
@@ -28,7 +28,7 @@
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.10
-Release:	%release_func 1801
+Release:	%release_func 1802
 License:	GPLv3
 Group:		System Environment/Daemons
 URL:		http://www.nongnu.org/dhcp-fwd/
@@ -161,6 +161,7 @@ install -D -p -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/dhcp-forwarder.conf
 
 touch $RPM_BUILD_ROOT%_var/run/dhcp-fwd.pid
 
+%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init}
 %{!?with_minit:   rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 %{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir}
 %{!?with_sysv:    rm -rf $RPM_BUILD_ROOT%_var/run/dhcp-fwd.pid}
@@ -263,6 +264,9 @@ test "$1" -eq 1 || /bin/systemctl try-restart %name.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Sun Aug 19 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.10-1802
+- disabled upstart
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-1801
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list