[linux-firmware/f14/master] Update to 20100806

[David Woodhouse]

commit e6a80dadef5e42e471f49e1aaa40fd0d257b8f0f
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Aug 6 08:55:04 2010 +0100

    Update to 20100806

 .gitignore          |    1 +
 linux-firmware.spec |   12 ++++++++----
 sources             |    3 +--
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b53e8c4..3e6ecac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ nouveau-firmware-1.tar.bz2
 radeon-rlc-firmware-1.tar.bz2
 radeon-firmware-1.tar.bz2
 radeon-firmware-2.tar.bz2
+linux-firmware-20100806.tar.bz2
diff --git a/linux-firmware.spec b/linux-firmware.spec
index 9c36be7..b367fb2 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,8 +1,8 @@
 %define nvfw nouveau-firmware-1
 
 Name:		linux-firmware
-Version:	20100106
-Release:	4%{?dist}
+Version:	20100806
+Release:	2%{?dist}
 Summary:	Firmware files used by the Linux kernel
 
 Group:		System Environment/Kernel
@@ -10,7 +10,6 @@ License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
 URL:		http://www.kernel.org/
 Source0:	ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/%{name}-%{version}.tar.bz2
 Source1:	%{nvfw}.tar.bz2
-Source2:	radeon-firmware-2.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Provides:	kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
@@ -23,7 +22,6 @@ operate.
 
 %prep
 %setup -q -n linux-firmware-%{version} -b1
-tar -jxvf %{SOURCE2}
 
 
 %build
@@ -61,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/*
 
 %changelog
+* Fri Aug 06 2010 David Woodhouse <dwmw2 at infradead.org> 20100806-2
+- Remove duplicate radeon firmwares; they're upstream now
+
+* Fri Aug 06 2010 David Woodhouse <dwmw2 at infradead.org> 20100806-1
+- Update to linux-firmware-20100806 (more legacy firmwares from kernel source)
+
 * Fri Apr 09 2010 Dave Airlie <airlied at redhat.com> 20100106-4
 - Add further radeon firmwares
 
diff --git a/sources b/sources
index e588e34..27472af 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-9c34690e02b5a284a546c0aae7ef0599  linux-firmware-20100106.tar.bz2
+58aa7317b56effb599c29e4423118ee5  linux-firmware-20100806.tar.bz2
 554e432993f138bd5c6704dbca109d71  nouveau-firmware-1.tar.bz2
-ee8574e13b60be59b6b18b21e20d9e3a  radeon-firmware-2.tar.bz2