1 files changed, 23 insertions, 15 deletions
diff --git a/tor.spec.in b/tor.spec.in
index 54b9be092a..25557b73e2 100644
--- a/tor.spec.in
+++ b/tor.spec.in
@@ -15,13 +15,6 @@
 %define toruser @TORUSER@
 %define torgroup @TORGROUP@
 
-## Target a specific arch and OS
-#
-# default is i386 linux
-
-## Override any system rpm macros
-#
-
 ## Version song and dance
 #
 # This should be the Tor version number, as it appears on the tarball,
@@ -54,14 +47,11 @@
 
 %if %{is_fc}
 %define ostag %(sed -e 's/^.*release /fc/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/fedora-release)
-%else
+%endif
+
 %if %{is_rh}
 %define ostag %(sed -e 's/^.*release /rh/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/redhat-release)
 %endif
-%endif
-
-# These are probably wrong... just placeholders should we actually
-# end up supporting these distributions
 
 %if %{is_mdk}
 %define ostag mdk
@@ -116,7 +106,7 @@ Group: System Environment/Daemons
 
 License: 3-clause BSD
 Vendor: The Tor Project (https://torproject.org)
-Packager: Andrew Lewman <andrew@torproject.org>
+Packager: Erinn Clark <erinn@torproject.org>
 
 %if %{is_suse}
 Requires: openssl >= 0.9.7
@@ -127,6 +117,7 @@ BuildRequires: openssl-devel >= 0.9.7
 %endif
 %if %{is_fc}
 BuildRequires: rpm-build >= 4.0
+Conflicts: tor-core, tor-lsb, tor-upstart
 %endif
 Requires(pre): /usr/bin/id, /bin/date, /bin/sh
 Requires(pre): %{_sbindir}/useradd, %{_sbindir}/groupadd
@@ -163,7 +154,7 @@ for high-stakes anonymity.
 
 %build
 %if %{is_suse}
-%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup}
+%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} --docdir=%{_docdir}/%{name}
 %else
 %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} 
 %endif
@@ -272,13 +263,20 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO
+%if %{is_suse}
+%doc INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO doc/*html
+%endif
+%doc INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO
 %{_mandir}/man*/*
 %{_bindir}/tor
 %{_bindir}/torctl
 %{_bindir}/torify
 %{_bindir}/tor-resolve
 %{_bindir}/tor-gencert
+%if %{is_suse}
+%else
+%{_docdir}/*
+%endif
 %{_datadir}/tor/geoip
 %config %{_initrddir}/%{name}
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}
@@ -289,6 +287,16 @@ exit 0
 %attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name}
 
 %changelog
+* Fri Aug 20 2010 Erinn Clark <erinn@torproject.org>
+- add conflicts for Fedora packages
+- add logic for SuSE since it requires special doc handling
+
+* Mon Feb 22 2010 Erinn Clark <erinn@torproject.org>
+- remove AUTHORS from %doc line since it no longer exists upstream
+- switch maintainers
+
+* Fri May 01 2009 Andrew Lewman <andrew@torproject.org>
+- clean up distro detection and remove dead comment blocks
 
 * Sun Feb 22 2009 Andrew Lewman <andrew@torproject.org>
 - update the description, vendor, and packager