[packages/linux-firmware] - package all iwl7260 firmware here, it's more recent than unmaintained sources for iwlwifi-7260-uco

[baggins]

commit ca7525397022768a25ee03fa701717cda179740b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Dec 23 23:55:50 2016 +0100

    - package all iwl7260 firmware here, it's more recent than unmaintained sources for iwlwifi-7260-ucode
    - rel 2

 linux-firmware.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/linux-firmware.spec b/linux-firmware.spec
index 7042de0..9ab1f1d 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,6 +1,6 @@
 # TODO
 # - subpackages for various firmwares?
-%define		rel	1
+%define		rel	2
 %define		ver	20160923
 Summary:	Firmware files used by the Linux kernel
 Summary(pl.UTF-8):	Pliki firmware'u używane przez jądro Linuksa
@@ -203,6 +203,7 @@ Summary:	Firmware for Intel(R) Wireless WiFi Link 7260 Series Adapters
 Version:	25.30.13.0
 Release:	%{ver}.%{rel}
 License:	Redistributable, no modification permitted
+Obsoletes:	iwlwifi-7260-ucode
 
 %description -n iwl7260-firmware
 This package contains the firmware required by the Intel wireless
@@ -270,8 +271,8 @@ rmdir linux-firmware-*
 # Perhaps these should be built as subpackages of linux-firmware?
 # - ql{2100,2200,2300,2322,2400,2500}-firmware.spec
 %{__rm} ql{2100,2200,2300,2322,2400,2500}_fw.bin LICENCE.qla2xxx
-# - iwlwifi-{1000,3945,4965,5000,5150,6000,6030,7260}-ucode.spec
-%{__rm} iwlwifi-{1000-5,3945-[12],4965-[12],5000-[125],5150-2,6000-4,6000g2b-6,7260-{7,8,9,10,12,13,16,17}}.ucode
+# - iwlwifi-{1000,3945,4965,5000,5150,6000,6030}-ucode.spec
+%{__rm} iwlwifi-{1000-5,3945-[12],4965-[12],5000-[125],5150-2,6000-4,6000g2b-6}.ucode
 
 # (note: LICENCE.iwlwifi_firmware left for remaining iwlwifi files)
 # - obsolete versions of iwlwifi firmwares
@@ -549,6 +550,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n iwl7260-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
+/lib/firmware/iwlwifi-7260-*.ucode
 /lib/firmware/iwlwifi-7265-*.ucode
 /lib/firmware/iwlwifi-7265D-*.ucode
 /lib/firmware/iwlwifi-8000C-*.ucode
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linux-firmware.git/commitdiff/ca7525397022768a25ee03fa701717cda179740b