From: ajs <ajs>
Date: Thu, 23 Dec 2004 00:00:58 +0000 (+0000)
Subject: 2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
X-Git-Tag: frr-2.0-rc1~3281
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f3931751663bfbe511a8f1d04aef10c38744481a;p=matthieu%2Ffrr.git

2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* redhat/quagga.spec.in: daemonv6_list should contain only IPv6 daemons.
---

diff --git a/ChangeLog b/ChangeLog
index 6dfae743c4..50a29cc374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* redhat/quagga.spec.in: daemonv6_list should contain only IPv6 daemons.
+
 2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* redhat/quagga.spec.in: Add watchquagga, and fix some other
diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 950ef43984..a2a3ad1631 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -35,7 +35,7 @@
 %define		daemon_list	zebra ripd ospfd bgpd
 
 %if %{with_ipv6}
-%define		daemonv6_list	%{daemon_list} ripngd ospf6d
+%define		daemonv6_list	ripngd ospf6d
 %else
 %define		daemonv6_list	""
 %endif
@@ -362,6 +362,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 %changelog
+* Wed Dec 22 2004 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+- daemonv6_list should contain only IPv6 daemons
+
 * Wed Dec 22 2004 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 - watchquagga added
 - on upgrade, all daemons should be condrestart'ed