- up to 20120418, contains bnx2-mips-09-6.2.1b.fw

Changed files:
    linux-firmware.spec -> 1.9

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 23b59768188491ad0d5e83df18fd7aebd6751d7c..ef18c9125e47a7a78fd9134f6d1d8ff3218086d0 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,11 +1,11 @@
 Summary:       Firmware files used by the Linux kernel
 Name:          linux-firmware
-Version:       20110705
-Release:       3
+Version:       20120418
+Release:       1
 License:       GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
 Group:         Base/Kernel
 URL:           http://www.kernel.org/
-Source0:       ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/%{name}-%{version}.tar.bz2
+Source0:       ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/%{name}-%{version}.tar.gz
 # Source0-md5: 404fa9eb047a932138a5eaeeac30c4cc
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -15,22 +15,31 @@ Kernel-firmware includes firmware files required for some devices to
 operate.
 
 %prep
-%setup -q
+%setup -qc
+mv linux-firmware-*/* .
+rmdir linux-firmware-*
 
 %build
 # Remove firmware shipped in separate packages already
 # Perhaps these should be built as subpackages of linux-firmware?
-rm ql2???_fw.bin LICENCE.qla2xxx
-rm iwlwifi-*.ucode LICENCE.iwlwifi_firmware
+%{__rm} ql2???_fw.bin LICENCE.qla2xxx
+%{__rm} iwlwifi-*.ucode LICENCE.iwlwifi_firmware
+%{__rm} -rf ess korg sb16 yamaha
+# We have _some_ ralink firmware in separate packages already.
+%{__rm} rt73.bin rt2561.bin rt2561s.bin rt2661.bin
+# And _some_ conexant firmware.
+%{__rm} v4l-cx23418-apu.fw v4l-cx23418-cpu.fw v4l-cx23418-dig.fw v4l-cx25840.fw
+# Netxen firmware
+%{__rm} phanfw.bin LICENCE.phanfw
 
 # Remove source files we don't need to install
-rm -f usbdux/*dux */*.asm
+%{__rm} usbdux/*dux */*.asm
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/lib/firmware
 cp -a . $RPM_BUILD_ROOT/lib/firmware
-%{__rm} $RPM_BUILD_ROOT/lib/firmware/{WHENCE,LICENCE.*}
+%{__rm} $RPM_BUILD_ROOT/lib/firmware/{WHENCE,LICENCE.*,LICENSE.*}
 
 %clean
 rm -rf $RPM_BUILD_ROOT