summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2016-06-05 22:39:31 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-06-14 21:16:12 +0200
commitc161bb748218a54d24abbb84ffce61eede2c8f97 (patch)
treec2041ba8b6d761113b1673b449fdc9c342aa4b1d /redhat
parentdistro/redhat: Update to support CentOS/RHEL/Fedora, upstart/init/systemd (diff)
downloadfrr-c161bb748218a54d24abbb84ffce61eede2c8f97.tar.xz
frr-c161bb748218a54d24abbb84ffce61eede2c8f97.zip
redhat: Cleanup redhat options.
Start the cleanup of the redhat .spec file: 1) Remove snmp, it's hopelessly broken. 2) Multiple with_vtysh lines. 3) Fix vty group to be quaggavty Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'redhat')
-rw-r--r--redhat/quagga.spec.in11
1 files changed, 1 insertions, 10 deletions
diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 13fdc0798..13d7606d1 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -10,10 +10,8 @@
####################### Quagga configure options #########################
# with-feature options
-%{!?with_snmp: %global with_snmp 1 }
%{!?with_vtysh: %global with_vtysh 1 }
%{!?with_tcp_zebra: %global with_tcp_zebra 0 }
-%{!?with_vtysh: %global with_vtysh 1 }
%{!?with_pam: %global with_pam 1 }
%{!?with_ospfclient: %global with_ospfclient 1 }
%{!?with_ospfapi: %global with_ospfapi 1 }
@@ -24,7 +22,7 @@
%{!?with_shared: %global with_shared 1 }
%{!?with_multipath: %global with_multipath 64 }
%{!?quagga_user: %global quagga_user quagga }
-%{!?vty_group: %global vty_group quaggavt }
+%{!?vty_group: %global vty_group quaggavty }
%{!?with_fpm: %global with_fpm 0 }
%{!?with_watchquagga: %global with_watchquagga 1 }
@@ -114,10 +112,6 @@ Requires(pre): /sbin/install-info
Requires(preun): /sbin/install-info
Requires(post): /sbin/install-info
BuildRequires: texi2html texinfo autoconf patch libcap-devel groff
-%if %{with_snmp}
-BuildRequires: net-snmp-devel
-Requires: net-snmp
-%endif
%if %{with_vtysh}
BuildRequires: readline readline-devel ncurses ncurses-devel
Requires: ncurses
@@ -192,9 +186,6 @@ developing OSPF-API and quagga applications.
%if !%{with_shared}
--disable-shared \
%endif
-%if %{with_snmp}
- --enable-snmp \
-%endif
%if %{with_multipath}
--enable-multipath=%{with_multipath} \
%endif