automatic import of frropeneuler22.03_LTS_SP4

3 files changed, 6 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 97d8426..1032eef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /frr-10.3.1.tar.gz
 /frr-10.4.0.tar.gz
 /frr-10.4.1.tar.gz
+/frr-10.5.0.tar.gz
diff --git a/frr.spec b/frr.spec
index b2d5517..ba08340 100644
--- a/frr.spec
+++ b/frr.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:           frr
-Version:        10.4.1
+Version:        10.5.0
 Release:        1%{?dist}
 Summary:        Routing daemon
 License:        GPL-2.0-or-later AND ISC AND LGPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-or-later  OR ISC) AND MIT
@@ -128,7 +128,6 @@ autoreconf -ivf
     --enable-user=frr \
     --enable-group=frr \
     --enable-vty-group=frrvty \
-    --enable-rtadv \
     --enable-static=no \
     --enable-rpki \
     --with-moduledir=%{_libdir}/frr/modules \
@@ -186,6 +185,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 #Upstream does not maintain a stable API, these headers from -devel subpackage are no longer needed
 rm %{buildroot}%{_libdir}/frr/*.so
+rm -r %{buildroot}%{_libdir}/frr/pkgconfig/
 rm -r %{buildroot}%{_includedir}/frr/
 
 %pre
@@ -224,8 +224,8 @@ fi
 %selinux_relabel_post -s %{selinuxtype}
 #/var/tmp and /var/run need to be relabeled as well if FRR is running before upgrade
 if [ $1 == 2 ]; then
-    %{_sbindir}/restorecon -R /var/tmp/frr &> /dev/null
-    %{_sbindir}/restorecon -R /var/run/frr &> /dev/null
+    %{_sbindir}/restorecon -R /var/tmp/frr &> /dev/null || :
+    %{_sbindir}/restorecon -R /var/run/frr &> /dev/null || :
 fi
 
 %postun selinux
diff --git a/sources b/sources
index f973d40..4038ca2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef5647e61c9583f1f1c405044a2a4ecd  frr-10.4.1.tar.gz
+111e3f95419b2244f9922647805dc426  frr-10.5.0.tar.gz