[tor/f18] Move tor-systemd subpackage into main tor package

[Jamie Nguyen]

commit 685ebe3f5793be0c2a530ff78acd4d662a755f5c
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Mar 4 22:38:38 2013 +0000

    Move tor-systemd subpackage into main tor package

 tor.spec |   44 +++++++++++++++++---------------------------
 1 files changed, 17 insertions(+), 27 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index 966d97d..fb1218c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -18,12 +18,18 @@ Requires:       %{name}-systemd  = %{version}-%{release}
 Source0:        https://www.torproject.org/dist/%{name}-%{version}.tar.gz
 Source1:        https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
 Source2:        tor.logrotate
+Source10:       tor.systemd.service
 
-Obsoletes:      tor-core < 0:0.2.3.25-1801
-Provides:       tor-core = 0:%{version}-%{release}
+Obsoletes:      tor-core    < 0:0.2.3.25-1801
+Provides:       tor-core    = 0:%{version}-%{release}
+Obsoletes:      tor-systemd < 0:0.2.3.25-1801
+Provides:       tor-systemd = 0:%{version}-%{release}
 
 BuildRequires:  libevent-devel openssl-devel asciidoc
 Requires(pre):  shadow-utils
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 
 %package -n torify
@@ -34,17 +40,6 @@ Requires:       %{name} = %{version}-%{release}
 %{?noarch}
 
 
-%package systemd
-Summary:        Systemd initscripts for tor
-Group:          System Environment/Daemons
-Source10:       tor.systemd.service
-Requires:       %{name} = %{version}-%{release}
-Requires(post):    systemd
-Requires(preun):   systemd
-Requires(postun):  systemd
-%{?noarch}
-
-
 %description
 Tor is a connection-based low-latency anonymous communication system.
 
@@ -70,13 +65,6 @@ Tor is a connection-based low-latency anonymous communication system.
 This package contains the "torify" wrapper script.
 
 
-%description systemd
-Tor is a connection-based low-latency anonymous communication system.
-
-This package contains the systemd initscripts to start the "tor"
-daemon.
-
-
 %prep
 %setup -q
 
@@ -120,13 +108,13 @@ getent passwd %username >/dev/null || \
     -c 'TOR anonymizing user' -g %{username} %{username}
 exit 0
 
-%post systemd
+%post
 %systemd_post %{name}.service
 
-%preun systemd
+%preun
 %systemd_preun %{name}.service
 
-%postun systemd
+%postun
 %systemd_postun %{name}.service
 
 
@@ -136,6 +124,7 @@ exit 0
 %{_bindir}/tor-gencert
 %{_bindir}/tor-resolve
 %{_datadir}/tor
+%{_unitdir}/%{name}.service
 %{_mandir}/man1/tor.1*
 %{_mandir}/man1/tor-gencert.1*
 %{_mandir}/man1/tor-resolve.1*
@@ -158,10 +147,6 @@ exit 0
 %config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
 
 
-%files systemd
-%{_unitdir}/tor.service
-
-
 %changelog
 * Mon Mar 04 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1802
 - add missing %%{?dist}
@@ -183,6 +168,11 @@ exit 0
   references to several obsolete init systems
 - move the tor-core subpackage back into the main tor package to match upstream
   expectations and user expectations (ie, yum install tor)
+- move the tor-systemd subpackage back into the main tor package:
+  the main tor package has a hard requirement on tor-systemd, so there is no
+  purpose for keeping tor-systemd separate from the main package
+- remove "Requires: tor-systemd"
+