From: phobos <phobos@rootme.org>
Date: Sat, 2 May 2009 03:05:54 +0000 (-0400)
Subject: clean up distro detection and remove dead comment blocks
X-Git-Tag: tor-0.2.2.1-alpha~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e188ab9e75db5a9767c98e6cd3914e22b591bbdc;p=thirdparty%2Ftor.git

clean up distro detection and remove dead comment blocks
---

diff --git a/tor.spec.in b/tor.spec.in
index ec00415f48..6133ce6049 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
@@ -290,6 +280,9 @@ exit 0
 
 %changelog
 
+* 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