From 2c315c1300e2d4041c3a6f9bd08598a812f8cebd611b203df9f2252894d93d9b Mon Sep 17 00:00:00 2001 From: Erico Mendonca Date: Sun, 5 Apr 2020 19:29:20 +0000 Subject: [PATCH] Accepting request 791563 from home:mnhauke:network - Update to version 7.3 * Upstream does not provide a changelog this time - Remove patch: * fix_tests.patch (not longer needed) OBS-URL: https://build.opensuse.org/request/show/791563 OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=10 --- fix_tests.patch | 29 ----------------------------- frr-7.2.1.tar.gz | 3 --- frr-7.3.tar.gz | 3 +++ frr.changes | 8 ++++++++ frr.spec | 33 +++++++++++++++++++++++++-------- 5 files changed, 36 insertions(+), 40 deletions(-) delete mode 100644 fix_tests.patch delete mode 100644 frr-7.2.1.tar.gz create mode 100644 frr-7.3.tar.gz diff --git a/fix_tests.patch b/fix_tests.patch deleted file mode 100644 index 269dee2..0000000 --- a/fix_tests.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- tests/topotests/lib/topotest.py-orig 2019-12-10 23:17:14.241938136 -0300 -+++ tests/topotests/lib/topotest.py 2019-12-10 23:17:27.978005193 -0300 -@@ -29,7 +29,10 @@ - import sys - import functools - import glob --import StringIO -+try: -+ from StringIO import StringIO -+except ImportError: -+ from io import StringIO - import subprocess - import tempfile - import platform ---- tests/topotests/lib/common_config.py-orig 2019-12-10 23:17:59.526550785 -0300 -+++ tests/topotests/lib/common_config.py 2019-12-10 23:18:23.139134928 -0300 -@@ -28,7 +28,11 @@ - from functools import wraps - from re import search as re_search - --import StringIO -+try: -+ from StringIO import StringIO -+except ImportError: -+ from io import StringIO -+ - import os - import ConfigParser - import traceback diff --git a/frr-7.2.1.tar.gz b/frr-7.2.1.tar.gz deleted file mode 100644 index 75a898f..0000000 --- a/frr-7.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3 -size 5639773 diff --git a/frr-7.3.tar.gz b/frr-7.3.tar.gz new file mode 100644 index 0000000..eb06130 --- /dev/null +++ b/frr-7.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c209ed66a0331221649b8c21dc8c6704ce1696e2017ef4d48f8c2ac6b1fa01b7 +size 5782842 diff --git a/frr.changes b/frr.changes index 7f4cc56..dfbdbd3 100644 --- a/frr.changes +++ b/frr.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Feb 15 21:27:22 UTC 2020 - Martin Hauke + +- Update to version 7.3 + * Upstream does not provide a changelog this time +- Remove patch: + * fix_tests.patch (not longer needed) + ------------------------------------------------------------------- Sat Jan 18 20:25:42 UTC 2020 - Martin Hauke diff --git a/frr.spec b/frr.spec index 1e1305c..a44e202 100644 --- a/frr.spec +++ b/frr.spec @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %bcond_with cumulus %bcond_with datacenter @@ -29,16 +30,15 @@ %define frr_daemondir %{_prefix}/lib/frr Name: frr -Version: 7.2.1 +Version: 7.3 Release: 0 Summary: FRRouting Routing daemon -License: GPL-2.0-or-later and LGPL-2.1-or-later +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Networking/System URL: https://www.frrouting.org #Git-Clone: https://github.com/FRRouting/frr.git Source: https://github.com/FRRouting/frr/archive/%{name}-%{version}.tar.gz Source1: %{name}-tmpfiles.d -Patch0: fix_tests.patch BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module devel} BuildRequires: %{python_module pytest} @@ -134,15 +134,24 @@ Group: System/Libraries This library contains various utility functions to FRRouting, such as data types, buffers and socket handling. +%package -n libmlag_pb0 +Summary: FRRouting utility library +Group: System/Libraries + +%description -n libmlag_pb0 +This library contains part of the mlag implementation of FRRouting. + %package devel Summary: Header and object files for frr development Group: Development/Libraries/C and C++ Requires: libfrr0 = %{version} +Requires: libfrr_pb0 = %{version} +Requires: libfrrcares0 = %{version} +Requires: libfrrfpm_pb0 = %{version} Requires: libfrrospfapiclient0 = %{version} Requires: libfrrsnmp0 = %{version} -Requires: libfrr_pb0 = %{version} -Requires: libfrrfpm_pb0 = %{version} Requires: libfrrzmq0 = %{version} +Requires: libmlag_pb0 = %{version} %description devel The frr-devel package contains the header and object files necessary for @@ -150,7 +159,6 @@ developing OSPF-API and frr applications. %prep %setup -q -n %{name}-%{name}-%{version} -%patch0 %build # GCC LTO objects must be "fat" to avoid assembly errors @@ -292,6 +300,7 @@ fi %post -n libfrrospfapiclient0 -p /sbin/ldconfig %postun -n libfrrospfapiclient0 -p /sbin/ldconfig + %post -n libfrrsnmp0 -p /sbin/ldconfig %postun -n libfrrsnmp0 -p /sbin/ldconfig @@ -300,9 +309,13 @@ fi %post -n libfrr0 -p /sbin/ldconfig %postun -n libfrr0 -p /sbin/ldconfig + %post -n libfrrcares0 -p /sbin/ldconfig %postun -n libfrrcares0 -p /sbin/ldconfig +%post -n libmlag_pb0 -p /sbin/ldconfig +%postun -n libmlag_pb0 -p /sbin/ldconfig + %files %license COPYING COPYING-LGPLv2.1 %doc README.md @@ -354,10 +367,12 @@ fi %{frr_daemondir}/zebra %dir %{_libdir}/frr %dir %{_libdir}/frr/modules +%{_libdir}/frr/modules/zebra_cumulus_mlag.so %{_libdir}/frr/modules/zebra_fpm.so %{_libdir}/frr/modules/zebra_irdp.so %{_libdir}/frr/modules/bgpd_rpki.so %{_prefix}/lib/frr/vrrpd +%{_prefix}/lib/frr/generate_support_bundle.py %{_libdir}/frr/modules/bgpd_bmp.so %files -n libfrr_pb0 @@ -380,8 +395,10 @@ fi %{_libdir}/libfrr.so.0* %files -n libfrrcares0 -%{_libdir}/libfrrcares.so.0 -%{_libdir}/libfrrcares.so.0.0.0 +%{_libdir}/libfrrcares.so.0* + +%files -n libmlag_pb0 +%{_libdir}/libmlag_pb.so.0* %files devel %dir %{_includedir}/%{name}