v9.0.2

frr.spec

@@ -5,10 +5,11 @@
 %global _hardened_build 1
 %global selinuxtype targeted
 %define _legacy_common_support 1
-%bcond_without selinux
+%bcond grpc %{undefined rhel}
+%bcond selinux 1
 
 Name:           frr
-Version:        9.0.1
+Version:        9.0.2
 Release:        1%{?dist}
 Summary:        Routing daemon
 License:        GPLv2+
@@ -36,8 +37,10 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  git-core
 BuildRequires:  groff
+%if %{with grpc}
 BuildRequires:  grpc-devel
 BuildRequires:  grpc-plugins
+%endif
 BuildRequires:  json-c-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libtool
@@ -50,7 +53,6 @@ BuildRequires:  pam-devel
 BuildRequires:  patch
 BuildRequires:  perl-XML-LibXML
 BuildRequires:  perl-generators
-BuildRequires:  protobuf-c-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-pytest
 BuildRequires:  python3-sphinx
@@ -58,6 +60,7 @@ BuildRequires:  readline-devel
 BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  texinfo
+BuildRequires:  protobuf-c-devel
 
 Requires:       ncurses
 Requires:       net-snmp
@@ -102,6 +105,8 @@ SELinux policy modules for FRR package
 #Selinux
 mkdir selinux
 cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} selinux
+# C++14 or later needed for abseil-cpp 20230125; string_view needs C++17:
+sed -r -i 's/(AX_CXX_COMPILE_STDCXX\(\[)11(\])/\117\2/' configure.ac
 
 %build
 autoreconf -ivf
@@ -130,7 +135,7 @@ autoreconf -ivf
     --with-crypto=openssl \
     --with-vici-socket=/run/strongswan/charon.vici \
     --enable-fpm \
-    --enable-grpc
+    %{?with_grpc:--enable-grpc}
 
 %make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}