- fix iwlwifi dir deps

diff --git a/linux-firmware.spec b/linux-firmware.spec
index c95082ed3efb7f24d2ce7c48ab7a5a5433adeee9..761c0bb79190359918864f09b2ba84409c10c61c 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -735,42 +735,56 @@ rm -rf $RPM_BUILD_ROOT
 %files -n iwl100-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 %files -n iwl100-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-100-5.ucode
 /lib/firmware/iwlwifi-100-5.ucode
 
 %files -n iwl105-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-100-5.ucode
 /lib/firmware/iwlwifi-100-5.ucode
 
 %files -n iwl105-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-105-*.ucode
 /lib/firmware/iwlwifi-105-*.ucode
 
 %files -n iwl135-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-105-*.ucode
 /lib/firmware/iwlwifi-105-*.ucode
 
 %files -n iwl135-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-135-*.ucode
 /lib/firmware/iwlwifi-135-*.ucode
 
 %files -n iwl1000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-135-*.ucode
 /lib/firmware/iwlwifi-135-*.ucode
 
 %files -n iwl1000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-1000-*.ucode
 /lib/firmware/iwlwifi-1000-*.ucode
 
 %files -n iwl2000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-1000-*.ucode
 /lib/firmware/iwlwifi-1000-*.ucode
 
 %files -n iwl2000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-2000-*.ucode
 /lib/firmware/iwlwifi-2000-*.ucode
 
 %files -n iwl2030-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-2000-*.ucode
 /lib/firmware/iwlwifi-2000-*.ucode
 
 %files -n iwl2030-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/iwlwifi-2030-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-2030-*.ucode
 
 %files -n iwlax2xx-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/iwlwifi-2030-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-2030-*.ucode
 
 %files -n iwlax2xx-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-Qu-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-QuZ-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-bz-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-Qu-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-QuZ-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-bz-*.ucode


@@ -803,6 +817,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -n iwl3160-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 %files -n iwl3160-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-3160-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-3168-*.ucode
 /lib/firmware/iwlwifi-3160-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-3160-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-3168-*.ucode
 /lib/firmware/iwlwifi-3160-*.ucode


@@ -811,54 +827,72 @@ rm -rf $RPM_BUILD_ROOT
 %files -n iwl3945-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 %files -n iwl3945-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-3945-*.ucode
 /lib/firmware/iwlwifi-3945-*.ucode
 
 %files -n iwl4965-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-3945-*.ucode
 /lib/firmware/iwlwifi-3945-*.ucode
 
 %files -n iwl4965-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-4965-*.ucode
 /lib/firmware/iwlwifi-4965-*.ucode
 
 %files -n iwl5000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-4965-*.ucode
 /lib/firmware/iwlwifi-4965-*.ucode
 
 %files -n iwl5000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-5000-*.ucode
 /lib/firmware/iwlwifi-5000-*.ucode
 
 %files -n iwl5150-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-5000-*.ucode
 /lib/firmware/iwlwifi-5000-*.ucode
 
 %files -n iwl5150-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-5150-*.ucode
 /lib/firmware/iwlwifi-5150-*.ucode
 
 %files -n iwl6000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-5150-*.ucode
 /lib/firmware/iwlwifi-5150-*.ucode
 
 %files -n iwl6000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-6000-*.ucode
 /lib/firmware/iwlwifi-6000-*.ucode
 
 %files -n iwl6000g2a-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-6000-*.ucode
 /lib/firmware/iwlwifi-6000-*.ucode
 
 %files -n iwl6000g2a-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-6000g2a-*.ucode
 /lib/firmware/iwlwifi-6000g2a-*.ucode
 
 %files -n iwl6000g2b-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-6000g2a-*.ucode
 /lib/firmware/iwlwifi-6000g2a-*.ucode
 
 %files -n iwl6000g2b-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-6000g2b-*.ucode
 /lib/firmware/iwlwifi-6000g2b-*.ucode
 
 %files -n iwl6050-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-6000g2b-*.ucode
 /lib/firmware/iwlwifi-6000g2b-*.ucode
 
 %files -n iwl6050-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-6050-*.ucode
 /lib/firmware/iwlwifi-6050-*.ucode
 
 %files -n iwl7260-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-6050-*.ucode
 /lib/firmware/iwlwifi-6050-*.ucode
 
 %files -n iwl7260-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-7260-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-7265-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-7265D-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-7260-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-7265-*.ucode
 /lib/firmware/intel/iwlwifi/iwlwifi-7265D-*.ucode


@@ -869,24 +903,32 @@ rm -rf $RPM_BUILD_ROOT
 %files -n iwl8000C-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 %files -n iwl8000C-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-8000C-*.ucode
 /lib/firmware/iwlwifi-8000C-*.ucode
 
 %files -n iwl8265-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-8000C-*.ucode
 /lib/firmware/iwlwifi-8000C-*.ucode
 
 %files -n iwl8265-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-8265-*.ucode
 /lib/firmware/iwlwifi-8265-*.ucode
 
 %files -n iwl9000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-8265-*.ucode
 /lib/firmware/iwlwifi-8265-*.ucode
 
 %files -n iwl9000-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-9000-*.ucode
 /lib/firmware/iwlwifi-9000-*.ucode
 
 %files -n iwl9260-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/intel/iwlwifi/iwlwifi-9000-*.ucode
 /lib/firmware/iwlwifi-9000-*.ucode
 
 %files -n iwl9260-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware

+%dir /lib/firmware/intel
+%dir /lib/firmware/intel/iwlwifi

 /lib/firmware/intel/iwlwifi/iwlwifi-9260-*.ucode
 /lib/firmware/iwlwifi-9260-*.ucode
 
 /lib/firmware/intel/iwlwifi/iwlwifi-9260-*.ucode
 /lib/firmware/iwlwifi-9260-*.ucode