aboutsummaryrefslogtreecommitdiff
path: root/tor.spec.in
diff options
context:
space:
mode:
Diffstat (limited to 'tor.spec.in')
-rw-r--r--tor.spec.in25
1 files changed, 11 insertions, 14 deletions
diff --git a/tor.spec.in b/tor.spec.in
index 54b9be092..c0ac4ea8d 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
@@ -272,8 +262,9 @@ exit 0
%files
%defattr(-,root,root)
-%doc AUTHORS INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO
+%doc INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO
%{_mandir}/man*/*
+%{_docdir}/tor/*
%{_bindir}/tor
%{_bindir}/torctl
%{_bindir}/torify
@@ -289,6 +280,12 @@ exit 0
%attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name}
%changelog
+* 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