diff options
Diffstat (limited to 'frr.spec')
| -rw-r--r-- | frr.spec | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -10,7 +10,7 @@ %endif Name: frr -Version: 10.3 +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 @@ -110,8 +110,8 @@ cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} selinux sed -r -i 's/(AX_CXX_COMPILE_STDCXX\(\[)11(\])/\117\2/' configure.ac %build -#hopefully just temporary due to rhbz#2327314 -export LDFLAGS="%{build_ldflags} -Wl,-z,noseparate-code" +export CFLAGS="%{optflags} -DINET_NTOP_NO_OVERRIDE" + autoreconf -ivf %configure \ @@ -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 |