From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sun, 5 Jun 2016 22:04:14 +0000 (-0400)
Subject: redhat: Cleanup some unneeded parameters
X-Git-Tag: frr-2.0-rc1~465^2~18
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8c05b72b5a3714b714f0883937f796fccc664955;p=mirror%2Ffrr.git

redhat: Cleanup some unneeded parameters

In the Quagga.spec file we have these fixes:

1) rpmversion was being defined but never used in it's scope.
Made it global so it couldbe properly referenced.

2) Use texi2html to tell you it's version instead of rpm
Note for the future to convert to mock we will need to
find a different methodology to handle this.

3) vtysh/isisd and pimd are turned on by default
No need to call them out.

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

Conflicts:
	redhat/quagga.spec.in
---

diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 13d7606d1c..c20b5597b0 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -10,15 +10,12 @@
 
 ####################### Quagga configure options #########################
 # with-feature options
-%{!?with_vtysh:			%global	with_vtysh		1 }
 %{!?with_tcp_zebra:		%global	with_tcp_zebra		0 }
 %{!?with_pam:			%global	with_pam		1 }
 %{!?with_ospfclient:		%global	with_ospfclient 	1 }
 %{!?with_ospfapi:		%global	with_ospfapi		1 }
 %{!?with_irdp:			%global	with_irdp		1 }
 %{!?with_rtadv:			%global	with_rtadv		1 }
-%{!?with_isisd:			%global	with_isisd		1 }
-%{!?with_pimd:			%global	with_pimd		1 }
 %{!?with_shared:		%global	with_shared		1 }
 %{!?with_multipath:		%global	with_multipath		64 }
 %{!?quagga_user:		%global	quagga_user		quagga }
@@ -38,12 +35,12 @@
 
 #### Version String tweak
 # Remove invalid characters form version string and replace with _
-%{expand: %%define rpmversion %(echo '@VERSION@' | tr [:blank:]- _ )}
+%{expand: %%global rpmversion %(echo '@VERSION@' | tr [:blank:]- _ )}
 %define         quaggaversion   @VERSION@
 
 #### Check version of texi2html 
 # Old versions don't support "--number-footnotes" option.
-%{expand: %%global texi2htmlversion %(rpm -q --qf '%%{VERSION}' texi2html | cut -d. -f1 )}
+%{expand: %%global texi2htmlversion %(/usr/bin/texi2html --version | cut -d. -f1)}
 
 #### Check for systemd or init.d (upstart)
 # Check for init.d (upstart) as used in CentOS 6 or systemd (ie CentOS 7)
@@ -69,21 +66,7 @@
 %{!?quagga_gid:		%define         quagga_gid      92 }
 %{!?vty_gid:		%define		vty_gid		85 }
 
-%define		daemon_list	zebra ripd ospfd bgpd
-
-%define		daemonv6_list	ripngd ospf6d
-
-%if %{with_isisd}
-%define		daemon_isisd	isisd
-%else
-%define		daemon_isisd	""
-%endif
-
-%if %{with_pimd}
-%define         daemon_pimd	pimd
-%else
-%define		daemon_pimd	""
-%endif
+%define		daemon_list	zebra ripd ospfd bgpd isisd ripngd ospfd6d
 
 %if %{with_watchquagga}
 %define         daemon_watchquagga	watchquagga
@@ -91,7 +74,7 @@
 %define		daemon_watchquagga	""
 %endif
 
-%define		all_daemons	%{daemon_list} %{daemonv6_list} %{daemon_isisd} %{daemon_pimd} %{daemon_watchquagga}
+%define		all_daemons	%{daemon_list} %{daemonv6_list}  %{daemon_watchquagga}
 
 # allow build dir to be kept
 %{!?keep_build:		%global		keep_build	0 }
@@ -112,10 +95,8 @@ 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_vtysh}
 BuildRequires:	readline readline-devel ncurses ncurses-devel
 Requires:		ncurses
-%endif
 %if %{with_pam}
 BuildRequires:	pam-devel
 Requires:		pam
@@ -192,9 +173,7 @@ developing OSPF-API and quagga applications.
 %if %{with_tcp_zebra}
 	--enable-tcp-zebra \
 %endif
-%if %{with_vtysh}
 	--enable-vtysh \
-%endif
 %if %{with_ospfclient}
 	--enable-ospfclient=yes \
 %else
@@ -215,11 +194,6 @@ developing OSPF-API and quagga applications.
 %else
 	--enable-rtadv=no \
 %endif
-%if %{with_isisd}
-	--enable-isisd \
-%else
-	--disable-isisd \
-%endif
 %if %{with_pam}
 	--with-libpam \
 %endif
@@ -240,7 +214,14 @@ developing OSPF-API and quagga applications.
 %else
 	--disable-watchquagga \
 %endif
+<<<<<<< HEAD
 	--enable-gcc-rdynamic
+=======
+	--enable-gcc-rdynamic \
+	--enable-isisd=yes \
+	--enable-systemd=yes \
+	--enable-poll=yes
+>>>>>>> 5713748... rebase me
 
 make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
 
@@ -330,9 +311,7 @@ zebra_spec_add_service ospf6d   2606/tcp "OSPF6d vty"
 %if %{with_ospfapi}
 zebra_spec_add_service ospfapi  2607/tcp "OSPF-API"
 %endif
-%if %{with_isisd}
 zebra_spec_add_service isisd    2608/tcp "ISISd vty"
-%endif
 
 %if "%{initsystem}" == "systemd"
 for daemon in %all_daemons ; do
@@ -504,19 +483,12 @@ rm -rf %{buildroot}
 %endif
 %{_sbindir}/ripngd
 %{_sbindir}/ospf6d
-%if %{with_pimd}
-%{_sbindir}/pimd
-%endif
-%if %{with_isisd}
 %{_sbindir}/isisd
-%endif
 %if %{with_shared}
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.so.*
 %endif
-%if %{with_vtysh}
 %{_bindir}/*
-%endif
 %config /etc/quagga/[!v]*
 %if "%{initsystem}" == "systemd"
 	%config %{_unitdir}/*.service
@@ -530,12 +502,8 @@ rm -rf %{buildroot}
 	%config /etc/rc.d/init.d/bgpd
 	%config /etc/rc.d/init.d/ripngd
 	%config /etc/rc.d/init.d/ospf6d
-	%if %{with_isisd}
-		%config /etc/rc.d/init.d/isisd
-	%endif
-	%if %{with_pimd}
-		%config /etc/rc.d/init.d/pimd
-	%endif
+	%config /etc/rc.d/init.d/isisd
+	%config /etc/rc.d/init.d/pimd
 %endif
 %config(noreplace) /etc/sysconfig/quagga
 %config(noreplace) /etc/pam.d/quagga