clean up distro detection and remove dead comment blocks

This commit is contained in:
phobos 2009-05-01 23:05:54 -04:00
parent 596e852c31
commit e188ab9e75

View File

@ -15,13 +15,6 @@
%define toruser @TORUSER@ %define toruser @TORUSER@
%define torgroup @TORGROUP@ %define torgroup @TORGROUP@
## Target a specific arch and OS
#
# default is i386 linux
## Override any system rpm macros
#
## Version song and dance ## Version song and dance
# #
# This should be the Tor version number, as it appears on the tarball, # This should be the Tor version number, as it appears on the tarball,
@ -54,14 +47,11 @@
%if %{is_fc} %if %{is_fc}
%define ostag %(sed -e 's/^.*release /fc/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/fedora-release) %define ostag %(sed -e 's/^.*release /fc/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/fedora-release)
%else %endif
%if %{is_rh} %if %{is_rh}
%define ostag %(sed -e 's/^.*release /rh/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/redhat-release) %define ostag %(sed -e 's/^.*release /rh/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/redhat-release)
%endif %endif
%endif
# These are probably wrong... just placeholders should we actually
# end up supporting these distributions
%if %{is_mdk} %if %{is_mdk}
%define ostag mdk %define ostag mdk
@ -290,6 +280,9 @@ exit 0
%changelog %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> * Sun Feb 22 2009 Andrew Lewman <andrew@torproject.org>
- update the description, vendor, and packager - update the description, vendor, and packager