From: Paul Jakma <paul.jakma@sun.com>
Date: Sat, 29 Nov 2008 16:42:04 +0000 (+0000)
Subject: [rpm] some defaults for Fedora are way out of date
X-Git-Tag: frr-2.0-rc1~2348
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4768061ad5d7c762f2272436a89e62d4e41676a2;p=matthieu%2Ffrr.git

[rpm] some defaults for Fedora are way out of date

* quagga.spec.in: No need to default to accomodate now ancient versions of
  Fedora
---

diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 0b2659fb66..a8c7fbf36f 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -48,16 +48,16 @@
 %define quagga_buildreqs %{quagga_buildreqs} patch libcap-devel
 
 # FC4 and 5 split texi2html out of tetex package.
-%if "%dist" == "fc4" || "%dist" == "fc5"
+%if "%dist" != "fc2" || "%dist" != "fc3"
 %define  quagga_buildreqs %{quagga_buildreqs} texi2html
 %endif
 
 # pam_stack is deprecated in FC5
 # default to pam_stack, default should be changed later.
-%if "%dist" == "fc5"
-%define	quagga_pam_source quagga.pam
-%else
+%if "%dist" == "fc4" || "%dist" == "fc3"
 %define	quagga_pam_source quagga.pam.stack
+%else
+%define	quagga_pam_source quagga.pam
 %endif
 ############################################################################