diff --git a/.cvsignore b/.cvsignore index 90be4aa..ea3e41f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ linux-firmware-20100106.tar.bz2 nouveau-firmware-1.tar.bz2 +radeon-rlc-firmware-1.tar.bz2 diff --git a/linux-firmware.spec b/linux-firmware.spec index 236938f..fdc9bb5 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -2,7 +2,7 @@ Name: linux-firmware Version: 20100106 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Firmware files used by the Linux kernel Group: System Environment/Kernel @@ -10,10 +10,11 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Provides: kernel-firmware = %{version} -Obsoletes: kernel-firmware < %{version} +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 Requires: udev %description @@ -21,7 +22,7 @@ Kernel-firmware includes firmware files required for some devices to operate. %prep -%setup -q -n linux-firmware-%{version} -b1 +%setup -q -n linux-firmware-%{version} -b1 -b2 %build @@ -49,16 +50,23 @@ 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 %files %defattr(-,root,root,-) -%doc WHENCE LICENCE.* +%doc WHENCE LICENCE.* ../LICENSE.radeon.firmware /lib/firmware/* %changelog +* Wed Feb 10 2010 Dave Airlie 20100106-3 +- add radeon RLC firmware - submitted upstream to dwmw2 already. + * Tue Feb 09 2010 Ben Skeggs 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) diff --git a/sources b/sources index e09aac6..b6b3785 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 9c34690e02b5a284a546c0aae7ef0599 linux-firmware-20100106.tar.bz2 554e432993f138bd5c6704dbca109d71 nouveau-firmware-1.tar.bz2 +189be8ab60025bf81f8841ab53175665 radeon-rlc-firmware-1.tar.bz2