rpms/iwl4965-firmware/devel iwl4965-firmware.spec,1.3,1.4

[Chauvet Nicolas (kwizart)]

Author: kwizart

Update of /cvs/pkgs/rpms/iwl4965-firmware/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23019

Modified Files:
	iwl4965-firmware.spec 
Log Message:
- Bump to keep the old 4.44.17 firmware dropped.
- Update firmware v1 to 228.57.1.21
- Add firmware v2 to 228.57.2.21



Index: iwl4965-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl4965-firmware/devel/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:47:50 -0000	1.4
@@ -1,17 +1,22 @@
+%define iwl4965_v1         228.57.1.21
+%define iwl4965_v2         228.57.2.21
+%define iwl4965_list       %{iwl4965_v1} %{iwl4965_v2}
+
 Name:           iwl4965-firmware
-Version:        4.44.1.20
+Version:        %{iwl4965_v2}
 Release:        2
 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_v1}.tgz
+Source1:        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 +26,20 @@
 
 %prep
 %setup -c -q
+%setup -c -q -D -T -a 1
+
 
 # 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 +50,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,6 +69,13 @@
 
 
 %changelog
+* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-2
+- Bump to keep the old 4.44.17 firmware dropped.
+
+* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-1
+- Update firmware v1 to 228.57.1.21
+- Add firmware v2 to 228.57.2.21
+
 * Tue Apr  8 2008 kwizart < kwizart at gmail.com > - 4.44.1.20-2
 - Drop the old 4.44.17 firmware