SPECS: iwlwifi-4965-ucode.spec - fix arekm's change (different kernel versi...

[patrys]

Author: patrys                       Date: Thu Jul 24 18:00:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix arekm's change (different kernel versions use different firmware files):
- provide both v1 and v2 firmware
- rel 2

---- Files affected:
SPECS:
   iwlwifi-4965-ucode.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/iwlwifi-4965-ucode.spec
diff -u SPECS/iwlwifi-4965-ucode.spec:1.7 SPECS/iwlwifi-4965-ucode.spec:1.8
--- SPECS/iwlwifi-4965-ucode.spec:1.7	Wed Jul 16 07:22:27 2008
+++ SPECS/iwlwifi-4965-ucode.spec	Thu Jul 24 20:00:44 2008
@@ -2,13 +2,16 @@
 Summary:	Microcode image for Intel Wireless WiFi Link 4965AGN Adapter
 Summary(pl.UTF-8):	Obraz mikrokodu dla układów bezprzewodowych Intel Wireless WiFi Link 4965AGN
 %define	_module	4965
+%define version1 228.57.1.21
 Name:		iwlwifi-%{_module}-ucode
 Version:	228.57.2.21
-Release:	1
+Release:	2
 License:	distributable
 Group:		Base/Kernel
 Source0:	http://www.intellinuxwireless.org/iwlwifi/downloads/%{name}-%{version}.tgz
 # Source0-md5:	83804fb4bfa991ffd4849c19a74bf38d
+Source1:	http://www.intellinuxwireless.org/iwlwifi/downloads/%{name}-%{version1}.tgz
+# Source1-md5:	bce5a13d681100aeee2ddac3beaff437
 URL:		http://www.intellinuxwireless.org/
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,21 +43,23 @@
 niepotrzebnych w danym trybie pracy urządzenia.
 
 %prep
-%setup -q
+%setup -q -c -a 1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/lib/firmware
 
-install iwlwifi-%{_module}-*.ucode $RPM_BUILD_ROOT/lib/firmware
-install LICENSE.%{name} $RPM_BUILD_ROOT/lib/firmware/%{name}-LICENSE
+install %{name}-%{version}/iwlwifi-%{_module}-*.ucode $RPM_BUILD_ROOT/lib/firmware
+install %{name}-%{version}/LICENSE.%{name} $RPM_BUILD_ROOT/lib/firmware/%{name}-LICENSE
+install %{name}-%{version1}/iwlwifi-%{_module}-*.ucode $RPM_BUILD_ROOT/lib/firmware
+install %{name}-%{version1}/LICENSE.%{name} $RPM_BUILD_ROOT/lib/firmware/%{name}-LICENSE
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.%{name}
+%doc %{name}-%{version}/README.%{name}
 /lib/firmware/%{name}-LICENSE
 /lib/firmware/*.ucode
 
@@ -64,6 +69,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2008/07/24 18:00:44  patrys
+- fix arekm's change (different kernel versions use different firmware files):
+- provide both v1 and v2 firmware
+- rel 2
+
 Revision 1.7  2008/07/16 05:22:27  arekm
 - up to 228.57.2.21
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iwlwifi-4965-ucode.spec?r1=1.7&r2=1.8&f=u