[redhat quagga.spec] Detect fedora release automatically

2006-06-15 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* redhat/quagga.spec.in: Get default distro automatically
	  by using rpm to query the fedora-release version.
	  And fix a typo (should be default_dist, not dist_default).

diff --git a/ChangeLog b/ChangeLog
index efe392d17c7571e25b71a021c77af01bd44bad3d..f948c43b72ddca2b482a60ccd6e122cadf675a8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+       * redhat/quagga.spec.in: Get default distro automatically
+         by using rpm to query the fedora-release version.
+         And fix a typo (should be default_dist, not dist_default).
+
 2006-05-28 Paul Jakma <paul.jakma@sun.com>
 
        * configure.ac: Update SOS CFLAGS, Xt shouldn't be used and

diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index bdde19308cab29d0c26a0c343f1baf7824dfc4e8..0b2659fb669413de5b38c342c064a15b426c7297 100644 (file)
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -39,8 +39,8 @@
 ############################################################################
 
 ####################### distro specific tweaks #############################
-# default distro. Override with rpmbuild -D "dist_default XXX" 
-%define                        dist_default            fc4
+# default distro. Override with rpmbuild -D "dist XXX" 
+%{expand: %%define default_dist %(rpm -q --qf 'fc%%{VERSION}' fedora-release | grep -v 'not installed')}
 %{!?dist:              %define         dist    %{default_dist}}
 
 # as distros change packages we depend on, our Requires have to change, sadly.