[iwl6050-firmware] - need to keep old firmware version available for kernels that need it - use available macros for st

[John W. Linville]

commit 4a7aad5daef8185c8c59474193177fe15c8d6db0
Author: John W. Linville <linville at tuxdriver.com>
Date:   Mon Jan 3 15:13:24 2011 -0500

    - need to keep old firmware version available for kernels that need it
    - use available macros for standard packaging-related commands

 iwl6050-firmware.spec |   25 ++++++++++++++-----------
 sources               |    1 +
 2 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/iwl6050-firmware.spec b/iwl6050-firmware.spec
index c4cfe12..b75dd98 100644
--- a/iwl6050-firmware.spec
+++ b/iwl6050-firmware.spec
@@ -1,12 +1,13 @@
 Name:           iwl6050-firmware
 Version:        41.28.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Firmware for Intel(R) Wireless WiFi Link 6050 Series Adapters
 
 Group:          System Environment/Kernel
 License:        Redistributable, no modification permitted
 URL:            http://intellinuxwireless.org/
 Source0:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6050-ucode-%{version}.tgz
+Source1:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6050-ucode-9.201.4.1.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,17 +22,17 @@ is subject to the terms and conditions contained inside the provided
 LICENSE file. Please read it carefully.
 
 %prep
-%setup -c -q
+%setup -c -q -a 1
 
 # Change permission
 find . -type f -exec chmod 0644 {} ';'
 
 pushd iwlwifi-6050-ucode-%{version}
 # Change encoding
-sed -i 's/\r//'  LICENSE.iwlwifi-6050-ucode README.iwlwifi-6050-ucode
+%{__sed} -i 's/\r//'  LICENSE.iwlwifi-6050-ucode README.iwlwifi-6050-ucode
 # Rename docs
-mv LICENSE.iwlwifi-6050-ucode ../LICENSE
-mv README.iwlwifi-6050-ucode ../README
+%{__mv} LICENSE.iwlwifi-6050-ucode ../LICENSE
+%{__mv} README.iwlwifi-6050-ucode ../README
 # Preserve timestamp
 touch -r *.ucode ../LICENSE ../README
 popd
@@ -42,15 +43,13 @@ popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/lib/firmware
-pushd iwlwifi-6050-ucode-%{version}
-install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/
-popd
+%{__rm} -rf %{buildroot}
+%{__mkdir_p} %{buildroot}/lib/firmware
+%{__install} -pm 0644 */iwlwifi-6050*.ucode %{buildroot}/lib/firmware/
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files
@@ -60,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan  3 2011 John W. Linville <linville at tuxdriver.com> - 41.28.5.1-2
+- need to keep old firmware version available for kernels that need it
+- use available macros for standard packaging-related commands
+
 * Thu Dec 16 2010 John W. Linville <linville at tuxdriver.com> - 41.28.5.1-1
 - Update for firmware release 41.28.5.1
 
diff --git a/sources b/sources
index f41c6e1..12cd1cb 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+12a663e415e76b6c46fcfecaa9f8e40b  iwlwifi-6050-ucode-9.201.4.1.tgz
 cb484a65b9139666d4ddebf60598a87b  iwlwifi-6050-ucode-41.28.5.1.tgz