[tor] updated to 2.2.33

[ensc]

commit 5e18c18d1f703851a45bdc6ce60f793ecae6bb5d
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sun Sep 18 12:41:07 2011 +0200

    updated to 2.2.33
    
    updated packaging of documentation to work with new version

 .gitignore |    2 ++
 lastver    |    2 +-
 sources    |    4 ++--
 tor.spec   |   44 ++++++++++++++++++--------------------------
 4 files changed, 23 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a40a4bf..eb0ef6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ tor-0.2.1.26.tar.gz.asc
 /tor-0.2.1.28.tar.gz.asc
 /tor-0.2.1.30.tar.gz
 /tor-0.2.1.30.tar.gz.asc
+/tor-0.2.2.33.tar.gz
+/tor-0.2.2.33.tar.gz.asc
diff --git a/lastver b/lastver
index d20c0fe..f60464c 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.30
+0.2.2.33
diff --git a/sources b/sources
index 8d33f78..237356f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6c6d61e053af5969a245d025c4cfce9d  tor-0.2.1.30.tar.gz
-41ae54e36a4e3df76282f48d63b27554  tor-0.2.1.30.tar.gz.asc
+ea99aba49694bb982d2fccc57a70d58e  tor-0.2.2.33.tar.gz
+41b5e6b654298dc513403af02fbd75f0  tor-0.2.2.33.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index f9205ce..5b9873e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -29,7 +29,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\
 
 
 Name:		tor
-Version:	0.2.1.30
+Version:	0.2.2.33
 Release:	%release_func 1700
 Group:		System Environment/Daemons
 License:	BSD
@@ -48,9 +48,10 @@ Source1:	https://www.torproject.org/dist/%name-%version.tar.gz.asc
 Source2:	tor.logrotate
 BuildRoot:	%_tmppath/%name-%version-%release-root
 
-BuildRequires:	libevent-devel openssl-devel transfig ghostscript
-BuildRequires:	/usr/bin/latex
-BuildRequires:	texlive-texmf-fonts
+# tor-design.pdf is not shipped anymore with tor
+Obsoletes:	tor-doc < 0.2.2
+
+BuildRequires:	libevent-devel openssl-devel
 BuildRequires:	fedora-usermgmt-devel
 Provides:		user(%username)  = %uid
 Provides:		group(%username) = %uid
@@ -70,13 +71,6 @@ Conflicts:	%name-core > %version-%release
 %{?noarch}
 
 
-%package doc
-Summary:	Documentation for tor
-Group:		System Environment/Daemons
-Requires:	%name-core = %version-%release
-%{?noarch}
-
-
 %package systemd
 Summary:	Systemd initscripts for tor
 Group:		System Environment/Daemons
@@ -137,12 +131,6 @@ Tor is a connection-based low-latency anonymous communication system.
 This package contains the "torify" wrapper script.
 
 
-%description doc
-Tor is a connection-based low-latency anonymous communication system.
-
-This package provides documentation for "tor".
-
-
 %description systemd
 Tor is a connection-based low-latency anonymous communication system.
 
@@ -171,11 +159,10 @@ EOF
 export LDFLAGS='-Wl,--as-needed'
 %configure
 make %{?_smp_mflags}
-make -C doc/design-paper tor-design.pdf
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT _doc _doc-torify
 
 make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
@@ -187,6 +174,10 @@ 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
+
 
 %pre core
 %__fe_groupadd %uid -r %username &>/dev/null || :
@@ -215,16 +206,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 
 
-%files doc
-%defattr(-,root,root,-)
-%doc doc/HACKING
-%doc doc/design-paper/tor-design.pdf
-
-
 %files core
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE README ChangeLog
+%doc LICENSE README ChangeLog
 %doc ReleaseNotes
+%doc _doc/*
 %dir               %_sysconfdir/tor
 %config(noreplace) %_sysconfdir/logrotate.d/tor
 %attr(0700,%username,%username) %dir %homedir
@@ -237,6 +223,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n torify
 %defattr(-,root,root,-)
+%doc _doc-torify/*
 %_bindir/torify
 %_mandir/man1/torify*
 %dir               %_sysconfdir/tor
@@ -254,6 +241,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 18 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.33-1700
+- updated to 2.2.33
+- removed -doc subpackage because shipped files are not available
+  anymore
+
 * Thu Jul 28 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.30-1700
 - added and use systemd macros