[dhcp-forwarder] drop upstart as it's no longer in Fedora

Peter Robinson pbrobinson at fedoraproject.org
Sat Oct 20 11:59:51 UTC 2012


commit 6a2be01d51cf4321f97dcee7fa4d52daf29328d3
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Oct 20 12:59:46 2012 +0100

    drop upstart as it's no longer in Fedora

 dhcp-forwarder.spec |   38 +++-----------------------------------
 1 files changed, 3 insertions(+), 35 deletions(-)
---
diff --git a/dhcp-forwarder.spec b/dhcp-forwarder.spec
index 5da0a24..91927e6 100644
--- a/dhcp-forwarder.spec
+++ b/dhcp-forwarder.spec
@@ -11,7 +11,6 @@
 %bcond_with		minit
 %bcond_with		sysv
 %bcond_without		systemd
-%bcond_with		upstart
 ##
 
 
@@ -58,17 +57,6 @@ Provides:		%name-sysv = %version-%release
 Obsoletes:		%name-sysv < %version-%release
 %{?noarch}
 
-%package upstart
-Summary:		upstart initscripts for dhcp-forwarder
-Group:			System Environment/Base
-Source10:		dhcp-forwarder.upstart
-Provides:		init(%name) = upstart
-Requires:		%name = %version-%release
-Requires(pre):		/etc/init
-Requires(post):		/usr/bin/killall
-Requires(postun):	/sbin/initctl
-%{?noarch}
-
 %package minit
 Summary:		minit initscripts for dhcp-forwarder
 Group:			System Environment/Base
@@ -108,14 +96,6 @@ This package provides the scripts which can be used to start dhcp-forwarder
 with the SysV initconcept.
 
 
-%description upstart
-dhcp-fwd forwards DHCP messages between subnets with different sublayer
-broadcast domains.
-
-This package provides the scripts which can be used to start dhcp-forwarder
-with the upstart initconcept.
-
-
 %description minit
 dhcp-fwd forwards DHCP messages between subnets with different sublayer
 broadcast domains.
@@ -155,7 +135,6 @@ 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}
@@ -195,13 +174,6 @@ fi
 test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null
 
 
-%post upstart
-/usr/bin/killall -u %username dhcp-fwd 2>/dev/null || :
-
-%preun upstart
-test "$1" != "0" || /sbin/initctl -q stop dhcp-forwarder || :
-
-
 %post systemd
 test "$1" -ne 1 || /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
@@ -250,14 +222,10 @@ test "$1" -eq 1 || /bin/systemctl try-restart %name.service >/dev/null 2>&1 || :
   %ghost %_var/run/dhcp-fwd.pid
 %endif
 
-%if 0%{?with_upstart:1}
-%files upstart
-  %defattr(-,root,root,-)
-  %config(noreplace) /etc/init/*
-%endif
-
-
 %changelog
+* Sat Oct 20 2012 Peter Robinson <pbrobinson at fedoraproject.org>	0.10-1900.1
+- drop upstart as it's no longer in Fedora
+
 * Sun Aug 19 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.10-1900
 - disabled upstart
 - removed old sysv cruft


More information about the scm-commits mailing list