From 7c976af2105735e6b68666d9a3dc85f31f4f72373663d1de2074fcea3ba9fda9 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Sat, 3 Oct 2009 01:21:11 +0000
Subject: [PATCH] Accepting request 21609 from Kernel:HEAD

Copy from Kernel:HEAD/kernel-firmware based on submit request 21609 from user michal-m

OBS-URL: https://build.opensuse.org/request/show/21609
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-firmware?expand=0&rev=2
---
 kernel-firmware.changes         | 12 +++++++++++
 kernel-firmware.spec            | 37 ++++++++++++++++++++++++++-------
 linux-firmware-20090421.tar.bz2 |  3 ---
 linux-firmware-20090821.tar.bz2 |  3 +++
 4 files changed, 44 insertions(+), 11 deletions(-)
 delete mode 100644 linux-firmware-20090421.tar.bz2
 create mode 100644 linux-firmware-20090821.tar.bz2

diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index 6b0c77c..b3fc834 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Oct  1 17:18:39 CEST 2009 - mmarek@suse.cz
+
+- update to 20090821
+  * includes newer iwlwifi firmware (bnc#537112)
+- use fdupes
+
+-------------------------------------------------------------------
+Mon Aug  3 16:44:21 CEST 2009 - gregkh@suse.de
+
+- add obsoletes for ralink-firmware (bnc#503836)
+
 -------------------------------------------------------------------
 Thu Apr 23 21:31:17 CEST 2009 - gregkh@suse.de
 
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index 70dbe8f..90742cd 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-firmware (Version 20090421)
+# spec file for package kernel-firmware (Version 20090821)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -16,19 +16,41 @@
 #
 
 
-Summary:        Linux kernel firmware files
 
 Name:           kernel-firmware
-Version:        20090421
-Release:        2
-License:        Distributable in unmodified form; GPL v2 only; GPL v2 or later; X11/MIT
+BuildRequires:  fdupes
+Version:        20090821
+Release:        1
+Summary:        Linux kernel firmware files
+License:        NON-OSI-COMPLIANT(no modification) ; GPL v2 only ; GPL v2 or later ; MIT License (or similar)
 Group:          System/Kernel
-Url:            www.kernel.org
+Url:            ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/
 Source0:        linux-firmware-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Obsoletes:      qlogic-firmware
 Obsoletes:      cxgb3-firmware
+Obsoletes:      ralink-firmware
+Obsoletes:      iwl3945-ucode
+Obsoletes:      iwl4965-ucode
+Obsoletes:      iwl5000-ucode
+Obsoletes:      iwl5150-ucode
+# supplements from the iwl* packages. We need to find a way how to
+# generate this automatically
+Supplements:    modalias(pci:v00008086d0000422[27]sv*sd*bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004229sv*sd*bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004230sv*sd*bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d0000423Asv*sd*bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004237sv*sd*bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004236sv*sd*bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004235sv*sd*bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004232sv*sd*bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004237sv*sd00001216bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004232sv*sd00001326bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004232sv*sd00001306bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004232sv*sd00001206bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004232sv*sd00001305bc*sc*i*)  
+Supplements:    modalias(pci:v00008086d00004232sv*sd00001205bc*sc*i*)  
 
 %description
 This package contains the firmware for in-kernel drivers that was
@@ -46,6 +68,7 @@ previously included in the kernel. It is shared by all kernels >=
 mkdir -p %{buildroot}/lib/firmware
 cp -avf * %{buildroot}/lib/firmware
 rm -f %{buildroot}/lib/firmware/WHENCE
+%fdupes %{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -56,5 +79,3 @@ rm -rf %{buildroot}
 /lib/firmware/*
 
 %changelog
-* Thu Apr 23 2009 gregkh@suse.de
-- initial package
diff --git a/linux-firmware-20090421.tar.bz2 b/linux-firmware-20090421.tar.bz2
deleted file mode 100644
index d262bd8..0000000
--- a/linux-firmware-20090421.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:382c6291c7b2dd881ea1d8f0b3ad33f5f35159b2ee4da0ec890c8a8a289274da
-size 4419117
diff --git a/linux-firmware-20090821.tar.bz2 b/linux-firmware-20090821.tar.bz2
new file mode 100644
index 0000000..b29fad1
--- /dev/null
+++ b/linux-firmware-20090821.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a227fbc885fbeb5bd58667e282f0843cf2369206662619ea290ea3ffc8c6ae5e
+size 5036535