diff --git a/.gitignore b/.gitignore index fc950c1..0f49f10 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ linux-firmware-20100806.tar.bz2 /linux-firmware-20110304.tar.bz2 /linux-firmware-20110601.tar.bz2 /linux-firmware-20110731.tar.bz2 +/linux-firmware-20120206.tar.gz diff --git a/linux-firmware.spec b/linux-firmware.spec index 6e643ae..65f35ca 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,13 +1,14 @@ +%global checkout 06c8f81 Name: linux-firmware -Version: 20110731 -Release: 2%{?dist} +Version: 20120206 +Release: 0.1.git%{checkout}%{?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 +Source0: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0 @@ -23,7 +24,7 @@ Kernel-firmware includes firmware files required for some devices to operate. %prep -%setup -q -n linux-firmware-%{version} +%setup -q -n linux-firmware-%{checkout} %build # Remove firmware shipped in separate packages already @@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/* %changelog +* Tue Feb 07 2012 Josh Boyer +- Update to latest upstream git snapshot. Fixes rhbz 786937 + * Thu Aug 04 2011 Tom Callaway 20110731-2 - resolve conflict with netxen-firmware diff --git a/sources b/sources index 3c1c6d5..f95bc48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -675feb025d2001d3bac24384ddc75e46 linux-firmware-20110731.tar.bz2 +2c0652ca5187ee9a71e801cd40a4cc69 linux-firmware-20120206.tar.gz