rpms/iwl4965-firmware/F-9 sources, 1.3, 1.4 iwl4965-firmware.spec, 1.3, 1.4

[Chauvet Nicolas (kwizart)]

Author: kwizart

Update of /cvs/pkgs/rpms/iwl4965-firmware/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19186

Modified Files:
	sources iwl4965-firmware.spec 
Log Message:
Sync F-8 and F-9



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iwl4965-firmware/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Dec 2007 12:23:44 -0000	1.3
+++ sources	11 Jul 2008 15:18:47 -0000	1.4
@@ -1,2 +1,3 @@
 6e5e5287bc9a8021bb35e5905e891638  iwlwifi-4965-ucode-4.44.17.tgz
-6e5c396da265d79d5675fd345adf24cc  iwlwifi-4965-ucode-4.44.1.20.tgz
+bce5a13d681100aeee2ddac3beaff437  iwlwifi-4965-ucode-228.57.1.21.tgz
+83804fb4bfa991ffd4849c19a74bf38d  iwlwifi-4965-ucode-228.57.2.21.tgz


Index: iwl4965-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl4965-firmware/F-9/iwl4965-firmware.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iwl4965-firmware.spec	8 Apr 2008 21:43:22 -0000	1.3
+++ iwl4965-firmware.spec	11 Jul 2008 15:18:47 -0000	1.4
@@ -1,17 +1,24 @@
+%define iwl4965_v          4.44.17
+%define iwl4965_v1         228.57.1.21
+%define iwl4965_v2         228.57.2.21
+%define iwl4965_list       %{iwl4965_v} %{iwl4965_v1} %{iwl4965_v2}
+
 Name:           iwl4965-firmware
-Version:        4.44.1.20
-Release:        2
+Version:        %{iwl4965_v2}
+Release:        1
 Summary:        Firmware for Intel® PRO/Wireless 4965 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-4965-ucode-%{version}.tgz
+Source0:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v}.tgz
+Source1:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v1}.tgz
+Source2:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v2}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Obsoletes:      iwlwifi-4965-ucode
-Provides:       iwlwifi-4965-ucode = %{version}
+ExcludeArch:    ppc ppc64
+
 
 %description
 This package contains the firmware required by the iwl4965 driver for Linux.
@@ -21,19 +28,20 @@
 
 %prep
 %setup -c -q
+%setup -c -q -D -T -a 1
+%setup -c -q -D -T -a 2
 
 # Change permission
 find . -type f -exec chmod 0644 {} ';'
 
 pushd iwlwifi-4965-ucode-%{version}
-# Rename docs
-cp LICENSE.iwlwifi-4965-ucode ../LICENSE
-cp README.iwlwifi-4965-ucode ../README
 # Change encoding
-sed -i 's/\r//'  ../LICENSE ../README
+sed -i 's/\r//'  LICENSE.iwlwifi-4965-ucode README.iwlwifi-4965-ucode
+# Rename docs
+mv LICENSE.iwlwifi-4965-ucode ../LICENSE
+mv README.iwlwifi-4965-ucode ../README
 # Preserve timestamp
-touch -r LICENSE.iwlwifi-4965-ucode ../LICENSE 
-touch -r README.iwlwifi-4965-ucode ../README
+touch -r *.ucode ../LICENSE ../README
 popd
 
 
@@ -44,9 +52,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/lib/firmware
-pushd iwlwifi-4965-ucode-%{version}
+for f in %{iwl4965_list} ; do
+pushd iwlwifi-4965-ucode-$f
 install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/
 popd
+done
 
 
 
@@ -61,8 +71,10 @@
 
 
 %changelog
-* Tue Apr  8 2008 kwizart < kwizart at gmail.com > - 4.44.1.20-2
-- Drop the old 4.44.17 firmware
+* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-1
+- Keep firmware v to 4.44.17 for older gold kernel
+- Update firmware v1 to 228.57.1.21
+- Add firmware v2 to 228.57.2.21
 
 * Tue Dec 18 2007 kwizart < kwizart at gmail.com > - 4.44.1.20-1
 - Update v1 to 4.44.1.20