diff --git a/linux-firmware.spec b/linux-firmware.spec index 50f23cf..823fdcd 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,6 +1,6 @@ Name: linux-firmware Version: 20210719 -Release: 1mamba +Release: 2mamba Summary: Collection of firmware files used by the Linux Kernel Group: System/Kernel and Hardware Vendor: openmamba @@ -13,18 +13,18 @@ License: Distributable ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END Provides: iwlwifi-firmware -Obsoletes: iwlwifi-firmware +Obsoletes: iwlwifi-firmware < 20210719 Provides: rt2860-firmware -Obsoletes: rt2860-firmware +Obsoletes: rt2860-firmware < 20210719 Provides: rt2870-firmware -Obsoletes: rt2870-firmware +Obsoletes: rt2870-firmware < 20210719 Provides: radeon-firmware -Obsoletes: radeon-firmware +Obsoletes: radeon-firmware < 20210719 Provides: rt2501-firmware -Obsoletes: rt2501-firmware +Obsoletes: rt2501-firmware < 20210719 Provides: linux_firmware Provides: linux-firmware-extra -Obsoletes: linux-firmware-extra +Obsoletes: linux-firmware-extra < 20210719 %description Collection of firmware files used by the Linux Kernel. @@ -37,17 +37,40 @@ Collection of firmware files used by the Linux Kernel. %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall +%makeinstall \ + FIRMWAREDIR=%{_prefix}/lib/firmware %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +%pre +if [ ! -L /lib -a ! -L /lib/firmware ]; then + # Migrate /lib/firmware to /usr/lib/firmware + [ -e /usr/lib/firmware ] && mv /usr/lib/firmware{,.rpmold} + mv /lib/firmware /usr/lib/firmware + if [ -e /usr/lib/firmware.rpmold ]; then + mv /usr/lib/firmware.rpmold/* /usr/lib/firmware/ || true + rmdir /usr/lib/firmware.rpmold || true + fi +fi +: + +%posttrans +if [ ! -L /lib -a ! -e /lib/firmware ]; then + # make /lib/firmware symlink to /usr/lib/firmware + ln -s ../usr/lib/firmware /lib/firmware +fi +: + %files %defattr(-,root,root) -%dir /lib/firmware -/lib/firmware/* +%dir %{_prefix}/lib/firmware +%{_prefix}/lib/firmware/* %changelog +* Tue Aug 10 2021 Silvan Calarco 20210719-2mamba +- migrate from /lib/firmware to /usr/lib/firmware and add /lib/firmware symlink + * Tue Jul 20 2021 Automatic Build System 20210719-1mamba - automatic version update by autodist