From 9eb024d08f5caaf27906e04e8b71bb9c7483a91c8396592d82452c2c5a3aeb74 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Fri, 2 Oct 2020 15:12:56 +0000 Subject: [PATCH] Accepting request 839160 from home:mtomaschewski:frr A little cleanup as preparation to add frr to SLE-15-SP3 (jsc#15015) - add build condition disabling mininet build require by default, needed by the optional topology tests. - removed one occurrence of vrrpd binary listed twice in file list OBS-URL: https://build.opensuse.org/request/show/839160 OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=20 --- frr.changes | 7 +++++++ frr.spec | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/frr.changes b/frr.changes index 8d5cfa4..5b3cc52 100644 --- a/frr.changes +++ b/frr.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 2 12:38:25 UTC 2020 - Marius Tomaschewski + +- add build condition disabling mininet build require by default, + needed by the optional topology tests. +- removed one occurrence of vrrpd binary listed twice in file list + ------------------------------------------------------------------- Wed Jul 1 12:21:24 UTC 2020 - Martin Hauke diff --git a/frr.spec b/frr.spec index 3137fdb..f582bd7 100644 --- a/frr.spec +++ b/frr.spec @@ -19,6 +19,7 @@ %bcond_with cumulus %bcond_with datacenter +%bcond_with mininet %define skip_python2 1 @@ -49,7 +50,9 @@ BuildRequires: flex BuildRequires: libtool BuildRequires: libyang-extentions BuildRequires: makeinfo +%if %{with mininet} BuildRequires: mininet +%endif BuildRequires: net-snmp-devel BuildRequires: pam-devel BuildRequires: pkgconfig @@ -386,9 +389,8 @@ getent passwd %{frr_user} >/dev/null || useradd -r -g %{frr_group} -G %{frrvty_g %{_libdir}/frr/modules/bgpd_rpki.so %{_libdir}/frr/modules/grpc.so %{_libdir}/frr/modules/dplane_fpm_nl.so -%{_prefix}/lib/frr/vrrpd -%{_prefix}/lib/frr/generate_support_bundle.py %{_libdir}/frr/modules/bgpd_bmp.so +%{_prefix}/lib/frr/generate_support_bundle.py %files -n libfrr_pb0 %{_libdir}/libfrr_pb.so.0*