SPECS/linux-firmware-raspberrypi.spec

@@ -8,7 +8,7 @@
 
 Name:		linux-firmware-raspberrypi
 Version:	20240528
-Release:	5%{?dist}
+Release:	4%{?dist}
 Summary:	Supplemental firmware used by Linux kernel for some Raspberry Pi models
 BuildArch:	noarch
 ExclusiveArch:	aarch64
@@ -46,41 +46,28 @@ install -c -m 644 %{bz_srcdir}/debian/firmware/broadcom/BCM43430A1.hcd %{buildro
 install -c -m 644 %{bz_srcdir}/debian/firmware/broadcom/BCM4345C0.hcd %{buildroot}%{_firmwarepath}/brcm/
 # Bluetooth for RPi 400
 install -c -m 644 %{bz_srcdir}/debian/firmware/broadcom/BCM4345C5.hcd %{buildroot}%{_firmwarepath}/brcm/
-# Other firmware files installed by linux-firmware are compressed, so compress these as well
-xz -C crc32 %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.txt
-xz -C crc32 %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456-sdio.bin
-xz -C crc32 %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456-sdio.clm_blob
-xz -C crc32 %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456-sdio.txt
-xz -C crc32 %{buildroot}%{_firmwarepath}/brcm/BCM43430A1.hcd
-xz -C crc32 %{buildroot}%{_firmwarepath}/brcm/BCM43430B0.hcd
-xz -C crc32 %{buildroot}%{_firmwarepath}/brcm/BCM4345C0.hcd
-xz -C crc32 %{buildroot}%{_firmwarepath}/brcm/BCM4345C5.hcd
 # Create model-specific symlinks
 # Raspberry Pi CM 4
-ln -s brcmfmac43455-sdio.bin.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin.xz
-ln -s brcmfmac43455-sdio.clm_blob.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.clm_blob.xz
+ln -s brcmfmac43455-sdio.bin %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin
+ln -s brcmfmac43455-sdio.clm_blob %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.clm_blob
 # Raspberry Pi 400
-ln -s brcmfmac43456-sdio.bin.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456-sdio.raspberrypi,400.bin.xz
-ln -s brcmfmac43456-sdio.clm_blob.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456-sdio.raspberrypi,400.clm_blob.xz
-ln -s brcmfmac43456-sdio.txt.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456-sdio.raspberrypi,400.txt.xz
+ln -s brcmfmac43456-sdio.bin %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456-sdio.raspberrypi,400.bin
+ln -s brcmfmac43456-sdio.clm_blob %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456-sdio.raspberrypi,400.clm_blob
+ln -s brcmfmac43456-sdio.txt %{buildroot}%{_firmwarepath}/brcm/brcmfmac43456-sdio.raspberrypi,400.txt
 # Raspberry Pi 5
-ln -s BCM4345C0.hcd.xz %{buildroot}%{_firmwarepath}/brcm/BCM4345C0.raspberrypi,5-model-b.hcd.xz
-ln -s brcmfmac43455-sdio.bin.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin.xz
-ln -s brcmfmac43455-sdio.clm_blob.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.clm_blob.xz
+ln -s BCM4345C0.hcd %{buildroot}%{_firmwarepath}/brcm/BCM4345C0.raspberrypi,5-model-b.hcd
+ln -s brcmfmac43455-sdio.bin %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin
+ln -s brcmfmac43455-sdio.clm_blob %{buildroot}%{_firmwarepath}/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.clm_blob
 
 %files
 %{_firmwarepath}/brcm/*
 
 %changelog
-* Thu Jul 25 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 20240528-5
-- Update to not conflict with linux-firmware-20240603-143.1.el9_4
-
-* Wed Jul 10 2024 Koichiro Iwao <meta@almalinux.org> - 20240528-4
-- Fix wrong symlink for RPi CM4
-- Set ExclusiveArch to aarch64
+* Mon Jul 08 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 20240528-4
+- Update to not conflict with linux-firmware-20240610-122.git90df68d2.el8_10
 
 * Mon Jun 03 2024 Koichiro Iwao <meta@almalinux.org> - 20240528-3
--  Add symlink for RPi CM4
+- Add symlink for RPi CM4
 
 * Tue May 28 2024 Koichiro Iwao <meta@almalinux.org> - 20240528-2
 - Fix symlink typo and add missing file
@@ -93,4 +80,4 @@ ln -s brcmfmac43455-sdio.clm_blob.xz %{buildroot}%{_firmwarepath}/brcm/brcmfmac4
 - Add firmware to support Bluetooth for RPi 3B+, Zero 2 W and 400
 
 * Thu Apr 20 2023 Koichiro Iwao <koichiro.iwao@miraclelinux.com> - 20230420-1
-- Initial creation
+- Initial creation