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

[Jamie Nguyen]

commit 52170267b9f12c699a8b562097775431ce792b9c
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Mar 4 22:35:41 2013 +0000

    Move tor-core subpackage into main tor package

 tor.spec |   29 ++++++++---------------------
 1 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index 61b8592..966d97d 100644
--- a/tor.spec
+++ b/tor.spec
@@ -14,19 +14,13 @@ Group:          System Environment/Daemons
 License:        BSD
 Summary:        Anonymizing overlay network for TCP (The onion router)
 URL:            http://www.torproject.org
-Requires:       %{name}-core     = %{version}-%{release}
 Requires:       %{name}-systemd  = %{version}-%{release}
-
-
-%package core
-Summary:        Core programs for tor
-Group:          System Environment/Daemons
 Source0:        https://www.torproject.org/dist/%{name}-%{version}.tar.gz
 Source1:        https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
 Source2:        tor.logrotate
 
-# tor-design.pdf is not shipped anymore with tor
-Obsoletes:      tor-doc < 0.2.2
+Obsoletes:      tor-core < 0:0.2.3.25-1801
+Provides:       tor-core = 0:%{version}-%{release}
 
 BuildRequires:  libevent-devel openssl-devel asciidoc
 Requires(pre):  shadow-utils
@@ -36,7 +30,7 @@ Requires(pre):  shadow-utils
 Summary:        The torify wrapper script
 Group:          System Environment/Daemons
 Requires:       torsocks
-Requires:       %{name}-core = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %{?noarch}
 
 
@@ -44,7 +38,7 @@ Requires:       %{name}-core = %{version}-%{release}
 Summary:        Systemd initscripts for tor
 Group:          System Environment/Daemons
 Source10:       tor.systemd.service
-Requires:       %{name}-core = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires(post):    systemd
 Requires(preun):   systemd
 Requires(postun):  systemd
@@ -70,13 +64,6 @@ strength of the anonymity provided. Tor is not presently suitable for
 high-stakes anonymity.
 
 
-%description core
-Tor is a connection-based low-latency anonymous communication system.
-
-This package provides the "tor" program, which serves as both a client
-and a relay node.
-
-
 %description -n torify
 Tor is a connection-based low-latency anonymous communication system.
 
@@ -126,7 +113,7 @@ mkdir _doc-torify
 mv _doc/torify.html _doc-torify
 
 
-%pre core
+%pre
 getent group %username >/dev/null || groupadd -r %username
 getent passwd %username >/dev/null || \
     useradd -r -s /sbin/nologin -d %{homedir} -M \
@@ -144,9 +131,6 @@ exit 0
 
 
 %files
-
-
-%files core
 %doc LICENSE README ChangeLog ReleaseNotes _doc/*
 %{_bindir}/tor
 %{_bindir}/tor-gencert
@@ -197,6 +181,9 @@ exit 0
   Fedora and renders the subpackage obsolete
 - amend logrotate file to match closer with upstream defaults, and removing
   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)
+
 
 
 * Thu Feb 07 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1801