fix (rpi-utils): add -devel packages and more packages and install more files and all that (#9207) (#9222)

anda/tools/rpi-utils/rpi-utils.spec

@@ -2,39 +2,45 @@
 %global commit_date 20251218
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-%define _unpackaged_files_terminate_build 0
-
 Name:			rpi-utils
 Version:		%{commit_date}.%{shortcommit}
-Release:		1%?dist
+Release:		2%?dist
 Summary:		A collection of scripts and simple applications for Raspberry Pi devices
 License:		BSD-3-Clause
 URL:			https://github.com/raspberrypi/utils
 Source0:		%{url}/archive/%{commit}.tar.gz
 Patch0:         dtoverlay-manpage.patch
-# BuildArch:      noarch
-BuildRequires:	cmake dtc libfdt-devel gcc-c++
+BuildRequires:	cmake dtc libfdt-devel gcc-c++ gnutls-devel
 
-Requires:       %{name}-dtmerge
-Requires:       %{name}-eeptools
-Requires:       %{name}-kdtc
-Requires:       %{name}-otpset
-Requires:       %{name}-overlaycheck
-Requires:       %{name}-ovmerge
-Requires:       %{name}-pinctrl
-Requires:       %{name}-piolib
-Requires:       %{name}-vcgencmd
-Requires:       %{name}-vclog
-Requires:       %{name}-vcmailbox
+Requires:       %{name}-dtmerge = %{evr}
+Requires:       %{name}-eeptools = %{evr}
+Requires:       %{name}-kdtc = %{evr}
+Requires:       %{name}-otpset = %{evr}
+Requires:       %{name}-overlaycheck = %{evr}
+Requires:       %{name}-ovmerge = %{evr}
+Requires:       %{name}-pinctrl = %{evr}
+Requires:       %{name}-piolib = %{evr}
+Requires:       %{name}-raspinfo = %{evr}
+Requires:       %{name}-rpifwcrypto = %{evr}
+Requires:       %{name}-vcgencmd = %{evr}
+Requires:       %{name}-vclog = %{evr}
+Requires:       %{name}-vcmailbox = %{evr}
 
 %description
-%{summary}
+%{summary}.
 
 %package        dtmerge
 Summary:        A tool for applying compiled DT overlays (*.dtbo) to base Device Tree files (*.dtb)
 %description    dtmerge
 %{summary}. Also includes the dtoverlay and dtparam utilities.
 
+%package        dtmerge-devel
+Summary:        Development files for %{name}-dtmerge-devel
+Requires:       %{name}-dtmerge = %{evr}
+
+%description    dtmerge-devel
+%{summary}.
+
 %package        eeptools
 Summary:        Tools for creating and managing EEPROMs for HAT+ and HAT board
 %description    eeptools
@@ -71,11 +77,40 @@ Summary:        A more powerful replacement for raspi-gpio, a tool for displayin
 
 %pkg_completion -Bn %name-pinctrl pinctrl
 
+%package        pinctrl-devel
+Summary:        Development files for %{name}-pinctrl-devel
+Requires:       %{name}-pinctrl = %{evr}
+
+%description    pinctrl-devel
+%{summary}.
+
 %package        piolib
 Summary:        A library for accessing the Pi 5's PIO hardware
 %description    piolib
 %{summary}.
 
+%package        piolib-devel
+Summary:        Development files for %{name}-piolib-devel
+Requires:       %{name}-piolib = %{evr}
+
+%description    piolib-devel
+%{summary}.
+
+%package        raspinfo
+Summary:        A short script to dump information about the Pi. Intended for the submission of bug reports
+%description    raspinfo
+%{summary}.
+
+%package        rpifwcrypto
+Summary:        A command line application and shared library for the firmware cryptography service
+%description    rpifwcrypto
+%{summary}.
+
+%package -n     %{name}-rpifwcrypto-devel
+Summary:        Development files for %{name}-rpifwcrypto-devel
+Requires:       %{name}-rpifwcrypto = %{evr}
+%description -n %{name}-rpifwcrypto-devel
+
 %package        vcgencmd
 Summary:        Query the VideoCore for information
 %description    vcgencmd
@@ -116,8 +151,11 @@ Summary:        A tool to get VideoCore 'assert' or 'msg' logs with optional -f
 %{_mandir}/man1/dtoverlay.1.gz
 %{_mandir}/man1/dtparam.1.gz
 %{_mandir}/man2/dtoverlay.2.gz
-%{_exec_prefix}/%{_lib}/libdtovl.so
-%{_exec_prefix}/%{_lib}/libdtovl.so.0
+%{_libdir}/libdtovl.so.0
+
+%files dtmerge-devel
+%{_includedir}/dtoverlay.h
+%{_libdir}/libdtovl.so
 
 %files eeptools
 %doc eeptools/README.md
@@ -138,6 +176,8 @@ Summary:        A tool to get VideoCore 'assert' or 'msg' logs with optional -f
 %doc overlaycheck/README.md
 %license LICENCE
 %{_bindir}/overlaycheck
+# idek but upstream cmake file puts this here
+%{_bindir}/overlaycheck_exclusions.txt
 
 %files ovmerge
 %doc ovmerge/README.md
@@ -148,8 +188,11 @@ Summary:        A tool to get VideoCore 'assert' or 'msg' logs with optional -f
 %doc pinctrl/README.md
 %license LICENCE
 %{_bindir}/pinctrl
-%{_exec_prefix}/%{_lib}/libgpiolib.so.0
-%{_exec_prefix}/%{_lib}/libgpiolib.so
+%{_libdir}/libgpiolib.so.0
+
+%files pinctrl-devel
+%{_includedir}/gpiolib.h
+%{_libdir}/libgpiolib.so
 
 %files piolib
 %doc piolib/README.md
@@ -162,8 +205,26 @@ Summary:        A tool to get VideoCore 'assert' or 'msg' logs with optional -f
 %{_bindir}/piows2812
 %{_bindir}/quadenc
 %{_bindir}/rp1sm
-%{_exec_prefix}/%{_lib}/libpio.so.0
-%{_exec_prefix}/%{_lib}/libpio.so
+%{_libdir}/libpio.so.0
+
+%files piolib-devel
+%{_libdir}/libpio.so
+%{_includedir}/piolib/hardware/*.h
+%{_includedir}/piolib/pico/*.h
+%{_includedir}/piolib/*.h
+
+%files raspinfo
+%{_bindir}/raspinfo
+%doc raspinfo/README.md
+
+%files rpifwcrypto
+%{_bindir}/rpi-fw-crypto
+%{_libdir}/librpifwcrypto.so.0
+%doc rpifwcrypto/README.md
+
+%files rpifwcrypto-devel
+%{_libdir}/librpifwcrypto.so
+%{_includedir}/rpifwcrypto.h
 
 %files vcgencmd
 %license LICENCE
@@ -184,6 +245,9 @@ Summary:        A tool to get VideoCore 'assert' or 'msg' logs with optional -f
 %{_mandir}/man7/raspirev.7.gz
 
 %changelog
+* Tue Jan 13 2026 Owen Zimmerman <owen@fyralabs.com>
+- Seperate needed files into -devel packages, add more packages/files, install all files.
+
 * Mon May 19 2025 Owen-sz <owen@fyralabs.com>
 - Build shared libraries