[tor] Remove obsolete tor-upstart subpackage

[Jamie Nguyen]

commit dddb33c64b38434c8315eb91f0cd717c57f5f0cc
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Thu Feb 28 09:23:15 2013 +0000

    Remove obsolete tor-upstart subpackage

 tor.spec    |   42 +++++-------------------------------------
 tor.upstart |   10 ----------
 2 files changed, 5 insertions(+), 47 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index 241c9b8..be8535e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,7 +1,6 @@
 ## This package understands the following switches:
 %bcond_without		noarch
 %bcond_without		systemd
-%bcond_with		upstart
 
 %global _hardened_build	1
 
@@ -14,7 +13,7 @@
 
 Name:		tor
 Version:	0.2.3.25
-Release:	1910%{?dist}
+Release:	1911%{?dist}
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -34,7 +33,6 @@ Source2:	tor.logrotate
 Obsoletes:	tor-doc < 0.2.2
 
 BuildRequires:	libevent-devel openssl-devel asciidoc
-Requires:		init(%name)
 Requires(pre):  shadow-utils
 
 
@@ -52,7 +50,6 @@ Conflicts:	%name-core > %version-%release
 Summary:	Systemd initscripts for tor
 Group:		System Environment/Daemons
 Source10:	tor.systemd.service
-Provides:	init(%name) = systemd
 Requires:	%name-core = %version-%release
 Requires(post): systemd
 Requires(preun): systemd
@@ -60,18 +57,6 @@ Requires(postun): systemd
 %{?noarch}
 
 
-%package upstart
-Summary:		upstart initscripts for %name
-Group:			System Environment/Base
-Source20:		%name.upstart
-Provides:		init(%name) = upstart
-Requires:		%name-core = %version-%release
-Requires(pre):		/etc/init
-Requires(post):		/usr/bin/killall
-Requires(postun):	/sbin/initctl
-%{?noarch}
-
-
 %description
 Tor is a connection-based low-latency anonymous communication system.
 
@@ -111,13 +96,6 @@ This package contains the systemd initscripts to start the "tor"
 daemon.
 
 
-%description upstart
-Tor is a connection-based low-latency anonymous communication system.
-
-This package contains the upstart compliant initscripts to start the "tor"
-daemon.
-
-
 %prep
 %setup -q
 
@@ -145,13 +123,10 @@ mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir,%_var/run/%name}
 install -D -p -m 0644 %SOURCE10 $RPM_BUILD_ROOT%_unitdir/%name.service
 install -D -p -m 0644 %SOURCE2  $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
 
-install -D -p -m 0644 %SOURCE20 $RPM_BUILD_ROOT%_sysconfdir/init/tor.conf
-
 mv $RPM_BUILD_ROOT%_datadir/doc/tor _doc
 mkdir _doc-torify
 mv _doc/torify.html _doc-torify
 
-%{!?with_upstart:  rm -rf $RPM_BUILD_ROOT%_sysconfdir/init}
 %{!?with_systemd:  rm -rf $RPM_BUILD_ROOT%_unitdir}
 
 
@@ -172,13 +147,6 @@ exit 0
 %systemd_postun_with_restart %name.service
 
 
-%postun upstart
-/usr/bin/killall -u %username -s INT tor 2>/dev/null || :
-
-%preun upstart
-test "$1" != "0" || /sbin/initctl -q stop tor || :
-
-
 %files
 
 
@@ -212,12 +180,12 @@ test "$1" != "0" || /sbin/initctl -q stop tor || :
   %_unitdir/%name.service
 %endif
 
-%if 0%{?with_upstart:1}
-%files upstart
-  %config(noreplace) /etc/init/*
-%endif
 
 %changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux at fedoraproject.org> 0.2.3.25-1911
+- remove tor-upstart subpackage as upstart is no longer installable within
+  Fedora and renders the the subpackage obsolete
+
 * Wed Feb 27 2013 Jamie Nguyen <jamielinux at fedoraproject.org> 0.2.3.25-1910
 - remove dependency on fedora-usermgmt as it has been queued for obsoletion
   from Fedora