From fac825d128d5db4b0899dda4a22d535e8eba6e31 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Tue, 9 Feb 2010 01:54:49 +0000
Subject: [PATCH] - Add firmware needed for nouveau to operate correctly (this
 is Fedora only     - do not upstream yet - we just moved it here from Fedora
 kernel)

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

diff --git a/.cvsignore b/.cvsignore
index 941d398..90be4aa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 linux-firmware-20100106.tar.bz2
+nouveau-firmware-1.tar.bz2
diff --git a/linux-firmware.spec b/linux-firmware.spec
index a9519ce..236938f 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,12 +1,15 @@
+%define nvfw nouveau-firmware-1
+
 Name:		linux-firmware
 Version:	20100106
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Firmware files used by the Linux kernel
 
 Group:		System Environment/Kernel
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Provides:	kernel-firmware = %{version}
@@ -18,7 +21,7 @@ Kernel-firmware includes firmware files required for some devices to
 operate.
 
 %prep
-%setup -q -n linux-firmware-%{version}
+%setup -q -n linux-firmware-%{version} -b1
 
 
 %build
@@ -41,6 +44,11 @@ mkdir -p $RPM_BUILD_ROOT/lib/firmware
 cp -r * $RPM_BUILD_ROOT/lib/firmware
 rm $RPM_BUILD_ROOT/lib/firmware/{WHENCE,LICENCE.*}
 
+pushd ../%{nvfw}
+mkdir -p $RPM_BUILD_ROOT/lib/firmware/nouveau
+cp -a * $RPM_BUILD_ROOT/lib/firmware/nouveau
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -51,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/*
 
 %changelog
+* Tue Feb 09 2010 Ben Skeggs <bskeggs@redhat.com> 20090106-2
+- Add firmware needed for nouveau to operate correctly (this is Fedora
+  only - do not upstream yet - we just moved it here from Fedora kernel)
+
 * Wed Jan 06 2010 David Woodhouse <David.Woodhouse@intel.com> 20090106-1
 - Update
 
diff --git a/sources b/sources
index cc9fee0..e09aac6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 9c34690e02b5a284a546c0aae7ef0599  linux-firmware-20100106.tar.bz2
+554e432993f138bd5c6704dbca109d71  nouveau-firmware-1.tar.bz2