[linux-firmware/f18] Consolidate netxen-firmware and ql2[123]xx-firmware packages (rhbz 864959)
Josh Boyer
jwboyer at fedoraproject.org
Wed Oct 10 14:09:11 UTC 2012
commit d1bb9a805738b8adbaaac80419a3ccf1380f0aae
Author: Josh Boyer <jwboyer at redhat.com>
Date: Wed Oct 10 09:50:45 2012 -0400
Consolidate netxen-firmware and ql2[123]xx-firmware packages (rhbz 864959)
linux-firmware.spec | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/linux-firmware.spec b/linux-firmware.spec
index ae16d9b..6c94faf 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,9 +1,9 @@
%global checkout 236367d
-%global iwlwifi_release 14
+%global iwlwifi_release 15
Name: linux-firmware
Version: 20120925
-Release: 0.1.git%{checkout}%{?dist}
+Release: 0.2.git%{checkout}%{?dist}
Summary: Firmware files used by the Linux kernel
Group: System Environment/Kernel
@@ -15,9 +15,11 @@ BuildArch: noarch
Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
Obsoletes: kernel-firmware < %{version} xorg-x11-drv-ati-firmware < 6.13.0-0.22
Obsoletes: ueagle-atm4-firmware < 1.0-5
-# The netxen firmware gets independently updated, so we'll use it instead of
-# whatever happens to be in the last checkout.
-Requires: netxen-firmware
+Obsoletes: netxen-firmware < 4.0.534-7
+Obsoletes: ql2100-firmware < 1.19.38-7
+Obsoletes: ql2200-firmware < 2.02.08-7
+Obsoletes: ql23xx-firmware < 3.03.28-5
+
BuildRequires: git
%description
@@ -221,14 +223,12 @@ git commit -m init .
%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 ql2[45]??_fw.bin
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
@@ -355,6 +355,9 @@ rm -rf $RPM_BUILD_ROOT
%doc WHENCE LICENCE.* LICENSE.*
%changelog
+* Wed Oct 10 2012 Josh Boyer <jwboyer at redhat.com>
+- Consolidate netxen-firmware and ql2[123]xx-firmware packages (rhbz 864959)
+
* Tue Sep 25 2012 Josh Boyer <jwboyer at redhat.com>
- Update to latest upstream. Adds marvell wifi updates (rhbz 858388)
More information about the scm-commits
mailing list