[tor/f18] Move torify subpackage into main tor package

[Jamie Nguyen]

commit 2257b53bb7f23639850a5fd03b1ac0fded478e4e
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Mar 4 22:42:45 2013 +0000

    Move torify subpackage into main tor package

 tor.spec |   45 +++++++++++++--------------------------------
 1 files changed, 13 insertions(+), 32 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index fb1218c..53282ee 100644
--- a/tor.spec
+++ b/tor.spec
@@ -24,22 +24,17 @@ 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}
+Obsoletes:      torify      < 0:0.2.3.25-1801
+Provides:       torify      = 0:%{version}-%{release}
 
 BuildRequires:  libevent-devel openssl-devel asciidoc
+Requires:       torsocks
 Requires(pre):  shadow-utils
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 
 
-%package -n torify
-Summary:        The torify wrapper script
-Group:          System Environment/Daemons
-Requires:       torsocks
-Requires:       %{name} = %{version}-%{release}
-%{?noarch}
-
-
 %description
 Tor is a connection-based low-latency anonymous communication system.
 
@@ -59,19 +54,14 @@ strength of the anonymity provided. Tor is not presently suitable for
 high-stakes anonymity.
 
 
-%description -n torify
-Tor is a connection-based low-latency anonymous communication system.
-
-This package contains the "torify" wrapper script.
-
-
 %prep
 %setup -q
 
 
 %build
 export LDFLAGS='-Wl,--as-needed'
-%configure --with-tor-user=%{username} --with-tor-group=%{username}
+%configure --with-tor-user=%{username} --with-tor-group=%{username} \
+    --docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
 
 
@@ -95,11 +85,6 @@ install -D -p -m 0644 %{SOURCE10} \
 install -D -p -m 0644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tor
 
-# Split docs for tor and torify
-mv $RPM_BUILD_ROOT%{_datadir}/doc/tor _doc
-mkdir _doc-torify
-mv _doc/torify.html _doc-torify
-
 
 %pre
 getent group %username >/dev/null || groupadd -r %username
@@ -119,7 +104,7 @@ exit 0
 
 
 %files
-%doc LICENSE README ChangeLog ReleaseNotes _doc/*
+%doc LICENSE README ChangeLog ReleaseNotes doc/HACKING doc/*.html
 %{_bindir}/tor
 %{_bindir}/tor-gencert
 %{_bindir}/tor-resolve
@@ -130,22 +115,12 @@ exit 0
 %{_mandir}/man1/tor-resolve.1*
 %dir %{_sysconfdir}/tor
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
+%config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/tor
 %attr(0700,%{username},%{username}) %dir %{homedir}
 %attr(0700,%{username},%{username}) %dir %{logdir}
 %attr(0750,%{username},%{username}) %dir %{_localstatedir}/run/tor
 
-%exclude %{_mandir}/man1/torify.1*
-%exclude %{_bindir}/torify
-
-
-%files -n torify
-%doc _doc-torify/*
-%{_bindir}/torify
-%{_mandir}/man1/torify*
-%dir               %{_sysconfdir}/tor
-%config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
-
 
 %changelog
 * Mon Mar 04 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1802
@@ -172,6 +147,12 @@ exit 0
   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"
+- move the torify subpackage back into the main tor package to match upstream
+  expectations and user expectations (ie, yum install tor)
+- remove the logic separating the documentation files for tor and torify,
+  which is now no longer needed
+- use --docdir option when running %%configure
+