rpms/iwl5000-firmware/devel .cvsignore, 1.1, 1.2 iwl5000-firmware.spec, 1.3, 1.4 sources, 1.2, 1.3

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/iwl5000-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9645

Modified Files:
	.cvsignore iwl5000-firmware.spec sources 
Log Message:
Add v2 firmware


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iwl5000-firmware/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2008 17:17:29 -0000	1.1
+++ .cvsignore	20 May 2009 13:59:30 -0000	1.2
@@ -0,0 +1,2 @@
+iwlwifi-5000-ucode-8.24.2.12.tgz
+iwlwifi-5000-ucode-5.4.A.11.tar.gz


Index: iwl5000-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl5000-firmware/devel/iwl5000-firmware.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- iwl5000-firmware.spec	25 Feb 2009 08:28:28 -0000	1.3
+++ iwl5000-firmware.spec	20 May 2009 13:59:30 -0000	1.4
@@ -1,12 +1,17 @@
+%define iwl5000_v1         5.4.A.11
+%define iwl5000_v2         8.24.2.12
+%define iwl5000_list       %{iwl5000_v1} %{iwl5000_v2}
+
 Name:           iwl5000-firmware
-Version:        5.4.A.11
-Release:        4
+Version:        %{iwl5000_v2}
+Release:        1
 Summary:        Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors
 
 Group:          System Environment/Kernel
 License:        Redistributable, no modification permitted
 URL:            http://intellinuxwireless.org/
-Source0:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5000-ucode-%{version}.tar.gz
+Source0:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5000-ucode-%{iwl5000_v1}.tar.gz
+Source1:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5000-ucode-%{iwl5000_v2}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,12 +23,19 @@ Usage of the firmware is subject to the 
 inside the provided LICENSE file. Please read it carefully.
 
 %prep
-%setup -q -n iwlwifi-5000-ucode-%{version}
+%setup -c -q
+%setup -c -q -D -T -a 1
 
+pushd iwlwifi-5000-ucode-%{version}
 # Change encoding
 sed -i 's/\r//'  LICENSE.iwlwifi-5000-ucode README.iwlwifi-5000-ucode
+# Rename docs
+mv LICENSE.iwlwifi-5000-ucode ../LICENSE
+mv README.iwlwifi-5000-ucode ../README
 # Preserve timestamp
-touch -r *.ucode LICENSE.iwlwifi-5000-ucode README.iwlwifi-5000-ucode
+touch -r *.ucode ../LICENSE ../README
+popd
+
 
 %build
 # Nothing to build
@@ -32,7 +44,11 @@ touch -r *.ucode LICENSE.iwlwifi-5000-uc
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/lib/firmware
+for f in %{iwl5000_list} ; do
+pushd iwlwifi-5000-ucode-$f
 install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/
+popd
+done
 
 
 %clean
@@ -41,10 +57,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.iwlwifi-5000-ucode README.iwlwifi-5000-ucode
+%doc LICENSE README
 /lib/firmware/*.ucode
 
 %changelog
+* Wed May 20 2009 John W. Linville <linville at redhat.com> - 8.24.2.12-1
+- Add v2 firmware
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.A.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iwl5000-firmware/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Aug 2008 11:17:56 -0000	1.2
+++ sources	20 May 2009 13:59:30 -0000	1.3
@@ -1 +1,2 @@
+45f74d052d52f6f473dc7a8d412f2274  iwlwifi-5000-ucode-8.24.2.12.tgz
 748860c5079dde1a1313e72511b9322a  iwlwifi-5000-ucode-5.4.A.11.tar.gz