[quagga] Fix build and uninstall-trigger for '--without ipv6' option

Adam Tkac atkac at fedoraproject.org
Thu May 3 09:33:01 UTC 2012


commit 75d4e0e3390e9ab3f7273dece5ad5dc82cbbf8ab
Author: David Ward <david.ward at ll.mit.edu>
Date:   Sat Apr 21 21:15:47 2012 -0400

    Fix build and uninstall-trigger for '--without ipv6' option

 quagga.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/quagga.spec b/quagga.spec
index 4775f40..effdef1 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -137,6 +137,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 %configure \
 %if %with_ipv6
 	--enable-ipv6=yes \
+%else
+	--enable-ipv6=no \
 %endif
 %if %with_snmp
 	--enable-snmp=yes \
@@ -313,6 +315,12 @@ fi
 	/sbin/chkconfig --del bgpd >/dev/null 2>&1 || :
 	/sbin/chkconfig --del ospfd >/dev/null 2>&1 || :
 	/sbin/chkconfig --del watchquagga >/dev/null 2>&1 || :
+%if !%with_ipv6
+	/sbin/service ospf6d stop >/dev/null 2>&1 || :
+	/sbin/service ripngd stop >/dev/null 2>&1 || :
+%endif
+	/sbin/chkconfig --del ospf6d >/dev/null 2>&1 || :
+	/sbin/chkconfig --del ripngd >/dev/null 2>&1 || :
 	/bin/systemctl try-restart zebra.service >/dev/null 2>&1 || :
 	/bin/systemctl try-restart isisd.service >/dev/null 2>&1 || :
 	/bin/systemctl try-restart ripd.service >/dev/null 2>&1 || :
@@ -320,8 +328,6 @@ fi
 	/bin/systemctl try-restart ospfd.service >/dev/null 2>&1 || :
 	/bin/systemctl try-restart watchquagga.service >/dev/null 2>&1 || :
 %if %with_ipv6
-	/sbin/chkconfig --del ospf6d >/dev/null 2>&1 || :
-	/sbin/chkconfig --del ripngd >/dev/null 2>&1 || :
 	/bin/systemctl try-restart ospf6d.service >/dev/null 2>&1 || :
 	/bin/systemctl try-restart ripngd.service >/dev/null 2>&1 || :
 %endif


More information about the scm-commits mailing list