From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Mon, 13 Jun 2016 16:54:39 +0000 (-0400)
Subject: redhat: V6 compilation is on by default
X-Git-Tag: frr-2.0-rc1~538
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=341969b3db27bd384dc453ec0e6b4a9a6513ab8f;p=matthieu%2Ffrr.git

redhat: V6 compilation is on by default

Let's not call it out as a separate item
anymore.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 5b391fc6ce..0443b0812d 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -66,9 +66,7 @@
 %{!?quagga_gid:		%define         quagga_gid      92 }
 %{!?vty_gid:		%define		vty_gid		85 }
 
-%define		daemon_list	zebra ripd ospfd bgpd isisd pimd
-
-%define		daemonv6_list	ripngd ospf6d
+%define		daemon_list	zebra ripd ospfd bgpd isisd pimd ripngd ospfd6d
 
 
 %if %{with_watchquagga}
@@ -77,7 +75,7 @@
 %define		daemon_watchquagga	""
 %endif
 
-%define		all_daemons	%{daemon_list} %{daemonv6_list}  %{daemon_watchquagga}
+%define		all_daemons	%{daemon_list} %{daemon_watchquagga}
 
 # allow build dir to be kept
 %{!?keep_build:		%global		keep_build	0 }