From b7e1b8232dd71a5d8369313c75fab3641762f44a Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Fri, 31 Jul 2026 14:33:08 +0200
Subject: [PATCH] Resolves: RHEL-222516 - frr-headers missing from FRR-10.6.1

---
 frr.spec | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/frr.spec b/frr.spec
index 4f297fc..5c5921c 100644
--- a/frr.spec
+++ b/frr.spec
@@ -9,7 +9,7 @@
 
 Name:           frr
 Version:        10.6.1
-Release:        2%{?dist}
+Release:        3%{?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
 URL:            http://www.frrouting.org
@@ -88,6 +88,15 @@ EIGRP and BFD.
 
 FRRouting is a fork of Quagga.
 
+%package headers
+Summary: Build headers for FRR
+BuildArch: noarch
+Requires: json-c-devel
+Requires: libyang-devel
+
+%description headers
+Build headers for FRR required to generate out of tree dplane plugins
+
 %if 0%{?with_selinux}
 %package selinux
 Summary:  Selinux policy for FRR
@@ -134,6 +143,7 @@ autoreconf -ivf
     --enable-static=no \
     --disable-ldpd \
     --disable-babeld \
+    --with-pkgconfigdir=%{_datadir}/pkgconfig \
     --with-moduledir=%{_libdir}/frr/modules \
     --with-yangmodelsdir=%{_datadir}/frr-yang/ \
     --with-crypto=openssl \
@@ -187,7 +197,6 @@ 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}%{_includedir}/frr/
 
 %pre
 %sysusers_create_compat %{SOURCE2}
@@ -268,7 +277,11 @@ rm tests/lib/*grpc*
 %{_datadir}/frr-yang/*.yang
 %{_tmpfilesdir}/%{name}.conf
 %{_sysusersdir}/%{name}.conf
-%{_libdir}/frr/pkgconfig/frr.pc
+
+%files headers
+%dir %{_includedir}/frr/
+%{_includedir}/frr/*
+%{_datadir}/pkgconfig/frr.pc
 
 %if 0%{?with_selinux}
 %files selinux
@@ -278,6 +291,9 @@ rm tests/lib/*grpc*
 %endif
 
 %changelog
+* Fri Jul 31 2026 Michal Ruprich <mruprich@redhat.com> - 10.6.1-3
+- Resolves: RHEL-222516 - frr-headers missing from FRR-10.6.1
+
 * Mon Jul 13 2026 Michal Ruprich <mruprich@redhat.com> - 10.6.1-2
 - Resolves: RHEL-176257 - AVC when reading user's site-packages