update to upstream 39.31.5.1, add epoch...

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3615 ec354946-7b23-47d6-9f5a-488ba84defc7

i/iwlwifi-1000-ucode/iwlwifi-1000-ucode-vl.spec

@@ -1,19 +1,28 @@
+%define iwl1000_v3         128.50.3.1
+%define iwl1000_v5         39.31.5.1
+%define iwl1000_list       %{iwl1000_v3} %{iwl1000_v5}
+
 Name:           iwlwifi-1000-ucode
-Version:        128.50.3.1
-Release: 1%{?_dist_release}
+Epoch:	        1
+Version:        %{iwl1000_v5}
+Release:        1%{?_dist_release}
 Summary:        Firmware for Intel® PRO/Wireless 1000 B/G/N network adaptors
 Summary(ja):    Intel® PRO/Wireless 1000 B/G/N ネットワークアダプタ用ファームウェア
 
 Group:          System Environment/Kernel
 License:        Redistributable, no modification permitted
 URL:            http://intellinuxwireless.org/
-Source0:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildArch:      noarch
+Source0: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-%{iwl1000_v5}.tgz
+Source1: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-%{iwl1000_v3}.tgz
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch:      noarch
 Requires:       udev
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
 %description
 This package contains the firmware required by the iwlagn driver
@@ -22,8 +31,10 @@ is subject to the terms and conditions contained inside the provided
 LICENSE file. Please read it carefully.
 
 %prep
-%setup -q
+%setup -c -q
+%setup -c -q -D -T -a 1
 
+pushd iwlwifi-1000-ucode-%{version}
 # Change encoding
 sed -i 's/\r//'  LICENSE.iwlwifi-1000-ucode README.iwlwifi-1000-ucode
 # Rename docs
@@ -31,6 +42,7 @@ mv LICENSE.iwlwifi-1000-ucode ../LICENSE
 mv README.iwlwifi-1000-ucode ../README
 # Preserve timestamp
 touch -r *.ucode ../LICENSE ../README
+popd
 
 
 %build
@@ -40,7 +52,11 @@ touch -r *.ucode ../LICENSE ../README
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/lib/firmware
-install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/
+for f in %{iwl1000_list} ; do
+ pushd iwlwifi-1000-ucode-$f
+  install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/
+ popd
+done
 
 
 %clean
@@ -54,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 21 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1:39:31.5.1-1
+- update to upstream version 39.31.5.1
+- add logic to preserve version 128.50.3.1 for older kernels
+- add Epoch: to account for Intel's bizarre release numbering
+
 * Mon Oct 25 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 128.50.3.1-1
 - initial build for Vine Linux