[quagga-dev 10271] Re: PATCH quagga.spec.in

David Lamparter equinox at opensourcerouting.org
Sat Feb 23 20:58:18 GMT 2013


On Fri, Feb 15, 2013 at 01:12:55PM +0200, Matti-Oskari Leppänen wrote:
> Hi, 
> 
> You're right .. here is patch where babeld is under ipv6.

Thanks, accepted.  Next time maybe provide a patch description? :)

-David


> --- quagga.spec.in.orig	2013-02-15 11:00:30.180679235 +0200
> +++ quagga.spec.in	2013-02-15 13:07:36.598106604 +0200
> @@ -44,7 +44,7 @@
>  %{!?dist:		%define		dist	%{default_dist}}
>  
>  # as distros change packages we depend on, our Requires have to change, sadly.
> -%define quagga_buildreqs texinfo tetex autoconf pam-devel
> +%define quagga_buildreqs texi2html texinfo tetex autoconf pam-devel
>  %define quagga_buildreqs %{quagga_buildreqs} patch libcap-devel
>  
>  # FC4 and 5 split texi2html out of tetex package.
> @@ -68,7 +68,7 @@
>  %define		daemon_list	zebra ripd ospfd bgpd
>  
>  %if %{with_ipv6}
> -%define		daemonv6_list	ripngd ospf6d
> +%define		daemonv6_list	ripngd babeld ospf6d
>  %else
>  %define		daemonv6_list	""
>  %endif
> @@ -97,17 +97,17 @@ Source0:	http://www.quagga.net/snapshots
>  URL:		http://www.quagga.net
>  %if %{with_snmp}
>  BuildRequires:	net-snmp-devel
> -Prereq:		net-snmp
> +Requires(pre):		net-snmp
>  %endif
>  %if %{with_vtysh}
>  BuildRequires:	readline readline-devel ncurses ncurses-devel
> -Prereq:		ncurses
> +Requires(pre):		ncurses
>  %endif
>  BuildRequires:	texinfo tetex autoconf pam-devel patch libcap-devel tetex
>  # Initscripts > 5.60 is required for IPv6 support
> -Prereq:		initscripts >= 5.60
> -Prereq:		ncurses pam
> -Prereq:		/sbin/install-info
> +Requires(pre):		initscripts >= 5.60
> +Requires(pre):		ncurses pam
> +Requires(pre):		/sbin/install-info
>  Provides:	routingdaemon
>  BuildRoot:	%{_tmppath}/%{name}-%{version}-root
>  Obsoletes:	bird gated mrt zebra
> @@ -406,6 +406,7 @@ rm -rf $RPM_BUILD_ROOT
>  %if %{with_ipv6}
>  %{_sbindir}/ripngd
>  %{_sbindir}/ospf6d
> +%{_sbindir}/babeld
>  %endif
>  %if %{with_isisd}
>  %{_sbindir}/isisd
> 


> 
> Christian Franke <chris at opensourcerouting.org> kirjoitti 15.2.2013 kello 12.34:
> 
> > On 02/15/2013 10:33 AM, Matti-Oskari Leppänen wrote:
> >> -%define		daemon_list	zebra ripd ospfd bgpd
> >> +%define		daemon_list	zebra babeld ripd ospfd bgpd
> >> 
> >> %if %{with_ipv6}
> >> %define		daemonv6_list	ripngd ospf6d
> > 
> > Babeld won't build if IPv6 is disabled. Are you sure that babeld is
> > supposed to be in daemon_list instead of daemonv6_list?
> > 
> > -Christian
> 

> _______________________________________________
> Quagga-dev mailing list
> Quagga-dev at lists.quagga.net
> http://lists.quagga.net/mailman/listinfo/quagga-dev

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 230 bytes
Desc: Digital signature
URL: <http://lists.quagga.net/pipermail/quagga-dev/attachments/20130223/ae6cd75e/attachment-0001.sig>


More information about the Quagga-dev mailing list