Accepting request 764811 from home:mnhauke:network

- Build with support for pcre, protobuf, rpki and zeromq by default

OBS-URL: https://build.opensuse.org/request/show/764811
OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=4

frr.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 15 20:34:50 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Build with support for pcre, protobuf, rpki and zeromq by default
+
 -------------------------------------------------------------------
 Wed Jan 15 14:34:59 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 

frr.spec

@@ -18,10 +18,6 @@
 
 %bcond_with     cumulus
 %bcond_with     datacenter
-%bcond_with     pcre
-%bcond_with     protobuf
-%bcond_with     rpki
-%bcond_with     zeromq
 
 %define skip_python2 1
 
@@ -57,14 +53,19 @@ BuildRequires:  mininet
 BuildRequires:  net-snmp-devel
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
+BuildRequires:  protobuf-c
 BuildRequires:  python-rpm-macros
 BuildRequires:  readline-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(json-c)
 BuildRequires:  pkgconfig(libcap)
 BuildRequires:  pkgconfig(libcares)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libprotobuf-c)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libyang) >= 1.0.101
+BuildRequires:  pkgconfig(libzmq) >= 4.0.0
+BuildRequires:  pkgconfig(rtrlib) >= 0.5.0
 Requires(post): %{install_info_prereq}
 Requires(pre):  %{install_info_prereq}
 Requires(pre):  shadow
@@ -73,19 +74,6 @@ Recommends:     logrotate
 Conflicts:      quagga
 Provides:       zebra = %{version}
 Obsoletes:      zebra < %{version}
-%if %{with pcre}
-BuildRequires:  pkgconfig(libpcre)
-%endif
-%if %{with protobuf}
-BuildRequires:  protobuf-c
-BuildRequires:  pkgconfig(libprotobuf-c)
-%endif
-%if %{with rpki}
-BuildRequires:  pkgconfig(rtrlib) >= 0.5.0
-%endif
-%if %{with zeromq}
-BuildRequires:  pkgconfig(libzmq) >= 4.0.0
-%endif
 
 %description
 FRR is free software which manages TCP/IP based routing protocols.
@@ -123,14 +111,12 @@ Group:          System/Libraries
 %description -n libfrrsnmp0
 This library contains part of the net-snmp agentx implementation of FRRouting.
 
-%if %{with zeromq}
 %package -n libfrrzmq0
 Summary:        FRRouting zeromq library
 Group:          System/Libraries
 
 %description -n libfrrzmq0
 This library contains part of the zermomq implementation of FRRouting.
-%endif
 
 %package -n libfrr0
 Summary:        FRRouting utility library
@@ -154,13 +140,9 @@ Group:          Development/Libraries/C and C++
 Requires:       libfrr0 = %{version}
 Requires:       libfrrospfapiclient0 = %{version}
 Requires:       libfrrsnmp0 = %{version}
-%if %{with protobuf}
 Requires:       libfrr_pb0 = %{version}
 Requires:       libfrrfpm_pb0 = %{version}
-%endif
-%if %{with zeromq}
 Requires:       libfrrzmq0 = %{version}
-%endif
 
 %description devel
 The frr-devel package contains the header and object files necessary for
@@ -208,29 +190,18 @@ autoreconf -fiv
     --enable-multipath=256 \
     --enable-nhrpd \
     --enable-snmp \
-%if %{with zeromq}
     --enable-zeromq \
-%endif
     --enable-ospfd \
     --enable-ospf6d \
     --enable-ospfapi \
     --enable-ospfclient \
     --with-libpam \
-%if %{with pcre}
-    --enable-pcreposix \
-%endif
     --enable-pbrd \
     --enable-pimd \
-%if %{with protobuf}
     --enable-protobuf \
-%endif
     --enable-ripd \
     --enable-ripngd \
-%if %{with rpki}
     --enable-rpki \
-%else
-    --disable-rpki \
-%endif
     --enable-rtadv \
     --enable-sharpd \
     --enable-staticd \
@@ -258,9 +229,7 @@ install -D -m 0644 tools/frr.service %{buildroot}%{_unitdir}/frr.service
 install -D -m 0644 tools%{_sysconfdir}/frr/daemons %{buildroot}%{_sysconfdir}/frr/daemons
 
 # add rpki module to daemon
-%if %{with rpki}
 sed -i -e 's/^\(bgpd_options=\)\(.*\)\(".*\)/\1\2 -M rpki\3/' %{buildroot}%{_sysconfdir}/frr/daemons
-%endif
 
 install -D -m 0644 redhat/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr
 install -D -m 0644 redhat/frr.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/frr
@@ -316,22 +285,18 @@ if [ "$1" = "0" ]; then
   groupdel frrvty
 fi
 
-%if %{with protobuf}
 %post   -n libfrr_pb0 -p /sbin/ldconfig
 %postun -n libfrr_pb0 -p /sbin/ldconfig
 %post   -n libfrrfpm_pb0 -p /sbin/ldconfig
 %postun -n libfrrfpm_pb0 -p /sbin/ldconfig
-%endif
 
 %post   -n libfrrospfapiclient0 -p /sbin/ldconfig
 %postun -n libfrrospfapiclient0 -p /sbin/ldconfig
 %post   -n libfrrsnmp0 -p /sbin/ldconfig
 %postun -n libfrrsnmp0 -p /sbin/ldconfig
 
-%if %{with zeromq}
 %post   -n libfrrzmq0 -p /sbin/ldconfig
 %postun -n libfrrzmq0 -p /sbin/ldconfig
-%endif
 
 %post   -n libfrr0 -p /sbin/ldconfig
 %postun -n libfrr0 -p /sbin/ldconfig
@@ -391,19 +356,15 @@ fi
 %dir %{_libdir}/frr/modules
 %{_libdir}/frr/modules/zebra_fpm.so
 %{_libdir}/frr/modules/zebra_irdp.so
-%if %{with rpki}
 %{_libdir}/frr/modules/bgpd_rpki.so
-%endif
 %{_prefix}/lib/frr/vrrpd
 %{_libdir}/frr/modules/bgpd_bmp.so
 
-%if %{with protobuf}
 %files -n libfrr_pb0
 %{_libdir}/libfrr_pb.so.0*
 
 %files -n libfrrfpm_pb0
 %{_libdir}/libfrrfpm_pb.so.0*
-%endif
 
 %files -n libfrrospfapiclient0
 %{_libdir}/libfrrospfapiclient.so.0*
@@ -412,10 +373,8 @@ fi
 %{_libdir}/libfrrsnmp.so.0*
 %{_libdir}/frr/modules/*_snmp.so
 
-%if %{with zeromq}
 %files -n libfrrzmq0
 %{_libdir}/libfrrzmq.so.0*
-%endif
 
 %files -n libfrr0
 %{_libdir}/libfrr.so.0*