clean up distro detection and remove dead comment blocks

diff --git a/tor.spec.in b/tor.spec.in
index ec00415f48d06d501f818d20894859c4d5b2b0a6..6133ce60497abc63b1c8afcd53801dd03c829b45 100644 (file)
--- 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