Merge pull request #18426 from opensourcerouting/rpm_snmp_rpki_fix

RedHat: Fixing for PR17793 - Allow RPM build without docs and/or rpki

1 files changed, 45 insertions, 6 deletions

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 4e0196d24a..b5a7a383c8 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -309,7 +309,6 @@ relevant to internet service providers using their own autonomous system
 number.
 %endif
 
-
 %package snmp
 Summary: SNMP support
 Group: System Environment/Daemons
@@ -413,9 +412,9 @@ Adds GRPC support to the individual FRR daemons.
     --disable-babeld \
 %endif
 %if %{with_vrrpd}
-	--enable-vrrpd \
+    --enable-vrrpd \
 %else
-	--disable-vrrpd \
+    --disable-vrrpd \
 %endif
 %if %{with_pam}
     --with-libpam \
@@ -446,8 +445,15 @@ Adds GRPC support to the individual FRR daemons.
     --disable-bgp-vnc \
 %endif
     --enable-isisd \
+%if %{with_docs}
+    --enable-doc \
+%else
+    --disable-doc \
+%endif
 %if %{with_rpki}
     --enable-rpki \
+%else
+    --disable-rpki \
 %endif
 %if %{with_bfdd}
     --enable-bfdd \
@@ -465,6 +471,7 @@ Adds GRPC support to the individual FRR daemons.
     --disable-grpc \
 %endif
     --enable-snmp \
+    --disable-zeromq \
     --enable-pcre2posix \
     # end
 
@@ -762,9 +769,19 @@ fi
 %endif
 %if %{with_pathd}
     %{_sbindir}/pathd
+    %{_libdir}/frr/modules/pathd_pcep.so
 %endif
-%{_libdir}/libfrr*.so*
-%{_libdir}/frr/modules/*.so
+%{_libdir}/libfrr.so*
+%{_libdir}/libfrrcares*
+%{_libdir}/libfrrospf*
+%if %{with_fpm}
+    %{_libdir}/frr/modules/zebra_fpm.so
+%endif
+%{_libdir}/frr/modules/zebra_cumulus_mlag.so
+%{_libdir}/frr/modules/dplane_fpm_nl.so
+%{_libdir}/frr/modules/bgpd_bmp.so
+%{_libdir}/libfrr_pb.so*
+%{_libdir}/libfrrfpm_pb.so*
 %{_libdir}/libmgmt_be_nb.so*
 %{_bindir}/*
 %config(noreplace) %{configdir}/[!v]*.conf*
@@ -808,12 +825,31 @@ fi
 %post rpki-rtrlib
 # add rpki module to daemons
 sed -i -e 's/^\(bgpd_options=\)\(.*\)\(".*\)/\1\2 -M rpki\3/' %{_sysconfdir}/frr/daemons
+%endif
 
+%if %{with_rpki}
 %postun rpki-rtrlib
 # remove rpki module from daemons
 sed -i 's/ -M rpki//' %{_sysconfdir}/frr/daemons
 %endif
 
+%if %{with_rpki}
+%files rpki-rtrlib
+%{_libdir}/frr/modules/bgpd_rpki.so
+%endif
+
+
+%files snmp
+%{_libdir}/libfrrsnmp.so*
+%{_libdir}/frr/modules/*snmp.so
+
+
+%if %{with_grpc}
+%files grpc
+%{_libdir}/libfrrgrpc_pb.*
+%{_libdir}/frr/modules/grpc.so
+%endif
+
 
 %files devel
 %{_libdir}/lib*.so
@@ -837,7 +873,10 @@ sed -i 's/ -M rpki//' %{_sysconfdir}/frr/daemons
 
 %changelog
 
-* Thu Oct 10  2024 Jafar Al-Gharaibeh <jafar@atcorp.com> - %{version}
+* Wed Mar 19 2025 Jafar Al-Gharaibeh <jafar@atcorp.com> - %{version}
+
+* Tue Mar 18 2025 Martin Winter <mwinter@opensourcerouting.org> 10.4-dev
+- Change docs and rpki to conditional package builds
 
 * Thu Oct 10 2024 Jafar Al-Gharaibeh <jafar@atcorp.com> - 10.3-dev
 - FRR 10.3 Development