From c81535df897c95a5429b33793a9b59d68810b1b4d157afd16d2a2fb66d01b322 Mon Sep 17 00:00:00 2001 From: Erico Mendonca Date: Wed, 4 Nov 2020 20:36:58 +0000 Subject: [PATCH] Accepting request 846077 from home:mnhauke:network - Update to version 7.5 * Upstream does not provide a changelog - Make grpc support optional and don't enable it by default OBS-URL: https://build.opensuse.org/request/show/846077 OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=22 --- frr-7.4.tar.gz | 3 --- frr-7.5.tar.gz | 3 +++ frr.changes | 7 +++++++ frr.spec | 19 +++++++++++++++++-- 4 files changed, 27 insertions(+), 5 deletions(-) delete mode 100644 frr-7.4.tar.gz create mode 100644 frr-7.5.tar.gz diff --git a/frr-7.4.tar.gz b/frr-7.4.tar.gz deleted file mode 100644 index 334de77..0000000 --- a/frr-7.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a -size 6074854 diff --git a/frr-7.5.tar.gz b/frr-7.5.tar.gz new file mode 100644 index 0000000..958320b --- /dev/null +++ b/frr-7.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54066e82a82751ec5876d9b67aa0cb24fe94e19e7371af290ac25099eda9f136 +size 6730659 diff --git a/frr.changes b/frr.changes index 5b3cc52..359889f 100644 --- a/frr.changes +++ b/frr.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 4 19:17:10 UTC 2020 - Martin Hauke + +- Update to version 7.5 + * Upstream does not provide a changelog +- Make grpc support optional and don't enable it by default + ------------------------------------------------------------------- Fri Oct 2 12:38:25 UTC 2020 - Marius Tomaschewski diff --git a/frr.spec b/frr.spec index f582bd7..49af4f6 100644 --- a/frr.spec +++ b/frr.spec @@ -2,7 +2,7 @@ # spec file for package frr # # Copyright (c) 2020 SUSE LLC -# Copyright (c) 2019, Martin Hauke +# Copyright (c) 2019-2020, Martin Hauke # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,6 +20,7 @@ %bcond_with cumulus %bcond_with datacenter %bcond_with mininet +%bcond_with grpc %define skip_python2 1 @@ -31,7 +32,7 @@ %define frr_daemondir %{_prefix}/lib/frr Name: frr -Version: 7.4 +Version: 7.5 Release: 0 Summary: FRRouting Routing daemon License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -60,7 +61,9 @@ BuildRequires: protobuf-c BuildRequires: python-rpm-macros BuildRequires: readline-devel BuildRequires: systemd-rpm-macros +%if %{with grpc} BuildRequires: pkgconfig(grpc) +%endif BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(libcap) BuildRequires: pkgconfig(libcares) @@ -103,12 +106,14 @@ Group: System/Libraries %description -n libfrr_pb0 This library contains protobuf memory management for FRRouting.. +%if %{with grpc} %package -n libfrrgrpc_pb0 Summary: FRRouting grpc protobuf library Group: System/Libraries %description -n libfrrgrpc_pb0 This library contains grpc protobuf definitions for FRRouting. +%endif %package -n libfrrospfapiclient0 Summary: API for FRRouting's OSPFv2 implementation @@ -161,7 +166,9 @@ Requires: libfrr0 = %{version} Requires: libfrr_pb0 = %{version} Requires: libfrrcares0 = %{version} Requires: libfrrfpm_pb0 = %{version} +%if %{with grpc} Requires: libfrrgrpc_pb0 = %{version} +%endif Requires: libfrrospfapiclient0 = %{version} Requires: libfrrsnmp0 = %{version} Requires: libfrrzmq0 = %{version} @@ -235,7 +242,9 @@ autoreconf -fiv --enable-shell-access \ --with-crypto=openssl \ --enable-config-rollbacks \ +%if %{with grpc} --enable-grpc \ +%endif --enable-systemd make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" @@ -309,8 +318,10 @@ getent passwd %{frr_user} >/dev/null || useradd -r -g %{frr_group} -G %{frrvty_g %post -n libfrr_pb0 -p /sbin/ldconfig %postun -n libfrr_pb0 -p /sbin/ldconfig +%if %{with grpc} %post -n libfrrgrpc_pb0 -p /sbin/ldconfig %postun -n libfrrgrpc_pb0 -p /sbin/ldconfig +%endif %post -n libfrrfpm_pb0 -p /sbin/ldconfig %postun -n libfrrfpm_pb0 -p /sbin/ldconfig @@ -387,7 +398,9 @@ getent passwd %{frr_user} >/dev/null || useradd -r -g %{frr_group} -G %{frrvty_g %{_libdir}/frr/modules/zebra_fpm.so %{_libdir}/frr/modules/zebra_irdp.so %{_libdir}/frr/modules/bgpd_rpki.so +%if %{with grpc} %{_libdir}/frr/modules/grpc.so +%endif %{_libdir}/frr/modules/dplane_fpm_nl.so %{_libdir}/frr/modules/bgpd_bmp.so %{_prefix}/lib/frr/generate_support_bundle.py @@ -398,8 +411,10 @@ getent passwd %{frr_user} >/dev/null || useradd -r -g %{frr_group} -G %{frrvty_g %files -n libfrrfpm_pb0 %{_libdir}/libfrrfpm_pb.so.0* +%if %{with grpc} %files -n libfrrgrpc_pb0 %{_libdir}/libfrrgrpc_pb.so.0* +%endif %files -n libfrrospfapiclient0 %{_libdir}/libfrrospfapiclient.so.0*