summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--redhat/quagga.spec.in4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index efe392d1..f948c43b 100644
--- 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 bdde1930..0b2659fb 100644
--- 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.