From bcc3b3e63e1806bfefa1d9439a424c9c940caf33 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Thu, 8 Apr 2010 23:23:52 +0000
Subject: [PATCH] - Add further radeon firmwares

---
 .cvsignore          |  1 +
 linux-firmware.spec | 14 +++++++-------
 sources             |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ea3e41f..9e869da 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 linux-firmware-20100106.tar.bz2
 nouveau-firmware-1.tar.bz2
 radeon-rlc-firmware-1.tar.bz2
+radeon-firmware-1.tar.bz2
diff --git a/linux-firmware.spec b/linux-firmware.spec
index fdc9bb5..e923015 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -2,7 +2,7 @@
 
 Name:		linux-firmware
 Version:	20100106
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Firmware files used by the Linux kernel
 
 Group:		System Environment/Kernel
@@ -10,7 +10,7 @@ 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-rlc-firmware-1.tar.bz2
+Source2:	radeon-firmware-1.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Provides:	kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
@@ -22,7 +22,8 @@ Kernel-firmware includes firmware files required for some devices to
 operate.
 
 %prep
-%setup -q -n linux-firmware-%{version} -b1 -b2
+%setup -q -n linux-firmware-%{version} -b2
+tar -jxvf %{SOURCE2}
 
 
 %build
@@ -50,10 +51,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/firmware/nouveau
 cp -a * $RPM_BUILD_ROOT/lib/firmware/nouveau
 popd
 
-pushd ..
-cp R600_rlc.bin R700_rlc.bin $RPM_BUILD_ROOT/lib/firmware/radeon
-popd
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -64,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/*
 
 %changelog
+* Fri Apr 09 2010 Dave Airlie <airlied@redhat.com> 20100106-4
+- Add further radeon firmwares
+
 * Wed Feb 10 2010 Dave Airlie <airlied@redhat.com> 20100106-3
 - add radeon RLC firmware - submitted upstream to dwmw2 already.
 
diff --git a/sources b/sources
index b6b3785..2e50ac0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 9c34690e02b5a284a546c0aae7ef0599  linux-firmware-20100106.tar.bz2
 554e432993f138bd5c6704dbca109d71  nouveau-firmware-1.tar.bz2
-189be8ab60025bf81f8841ab53175665  radeon-rlc-firmware-1.tar.bz2
+646b071d7f47d8f928f557be7aff3673  radeon-firmware-1.tar.bz2