[tor/f18] Remove obsolete tor-upstart package

[Jamie Nguyen]

commit 47496d9ca610a479c7ef9a5463d664c2eee65f21
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Mar 4 22:29:12 2013 +0000

    Remove obsolete tor-upstart package

 tor.spec    |   41 +++--------------------------------------
 tor.upstart |   10 ----------
 2 files changed, 3 insertions(+), 48 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index ce1a166..765847b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,6 +1,5 @@
 ## This package understands the following switches:
 %bcond_without      noarch
-%bcond_with         upstart
 
 %global _hardened_build 1
 
@@ -30,7 +29,6 @@ Source2:        tor.logrotate
 Obsoletes:      tor-doc < 0.2.2
 
 BuildRequires:  libevent-devel openssl-devel asciidoc
-Requires:       init(%{name})
 Requires(pre):  shadow-utils
 
 
@@ -46,7 +44,6 @@ Requires:       %{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
@@ -54,18 +51,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.
 
@@ -105,13 +90,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
 
@@ -141,16 +119,12 @@ 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
 
 # Split docs for tor and torify
 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}
-
 
 %pre core
 getent group %username >/dev/null || groupadd -r %username
@@ -168,12 +142,6 @@ exit 0
 %postun systemd
 %systemd_postun %{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
 
@@ -210,12 +178,6 @@ test "$1" != "0" || /sbin/initctl -q stop tor || :
 %{_unitdir}/tor.service
 
 
-%if 0%{?with_upstart:1}
-%files upstart
-  %config(noreplace) %{_sysconfdir}/init/*
-%endif
-
-
 %changelog
 * Mon Mar 04 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1802
 - add missing %%{?dist}
@@ -231,6 +193,9 @@ test "$1" != "0" || /sbin/initctl -q stop tor || :
   available, nor is it required or expected by upstream
 - do not remove users/groups in %%postun as the guidelines state:
   https://fedoraproject.org/wiki/Packaging:UsersAndGroups
+- remove tor-upstart subpackage as upstart is no longer installable within
+  Fedora and renders the subpackage obsolete
+
 
 
 * Thu Feb 07 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1801