Browse Source

linux-firmware:
- update to new upstream git master
- add subpackage to provide iwlwifi-firmware
- obsoletes/provides iwlwifi-*-ucode

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

daisuke 12 years ago
parent
commit
596e7a3f85
1 changed files with 60 additions and 8 deletions
  1. 60 8
      l/linux-firmware/linux-firmware-vl.spec

+ 60 - 8
l/linux-firmware/linux-firmware-vl.spec

@@ -2,8 +2,8 @@ Summary:	Firmware files used by the Linux kernel
 Summary(ja):	Linux Kernel で利用されるファームウェアファイル
 
 Name:		linux-firmware
-Version:	20120709
-Release:        2%{?_dist_release}
+Version:	20130214
+Release:        1%{?_dist_release}
 
 Group:		System Environment/Kernel
 License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -12,8 +12,10 @@ Source0:	%{name}-%{version}.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:	noarch
-Provides:	kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
-Obsoletes:	kernel-firmware < %{version} XOrg-drv-ati-firmware < 6.13.0-0.22
+Provides:	kernel-firmware = %{version} 
+Provides:       xorg-x11-drv-ati-firmware = 7.0
+Obsoletes:	kernel-firmware < %{version} 
+Obsoletes:      XOrg-drv-ati-firmware < 6.13.0-0.22
 Obsoletes:	ueagle-atm4-firmware < 1.0-5
 Obsoletes:	rt2870-firmware
 Obsoletes:	ivtv-firmware
@@ -23,14 +25,54 @@ Requires:	udev
 Kernel-firmware includes firmware files required for some devices to
 operate.
 
+%define iwlwifi_release 3%{_dist_release}
+%package -n iwlwifi-firmware
+Summary:	Firmware for Intel(R) Wireless WiFi Link Series Adapters
+Summary(ja):    Intel(R) Wireless WiFi Link シリーズ用ファームウェア集
+URL:            http://intellinuxwireless.org/
+License:	Redistributable, no modification permitted
+
+# obsoletes individual package
+Obsoletes: iwlwifi-100-ucode <= 39.31.5.1-1vl6
+Obsoletes: iwlwifi-1000-ucode <= 39.31.5.1-1vl6
+Obsoletes: iwlwifi-3945-ucode <= 15.32.2.9-1vl6
+Obsoletes: iwlwifi-4965-ucode <= 228.61.2.24-1vl6
+Obsoletes: iwlwifi-5000-ucode <= 8.83.5.1-1vl6
+Obsoletes: iwlwifi-5150-ucode <= 8.24.2.2-2vl6
+Obsoletes: iwlwifi-6000-ucode <= 9.221.4.1-2vl6
+Obsoletes: iwlwifi-6000g2a-ucode <= 17.168.5.2-1vl6
+Obsoletes: iwlwifi-6000g2b-ucode <= 17.168.5.2-1vl6
+Obsoletes: iwlwifi-6050-ucode <= 41.28.5.1-1vl6
+# provide ucode package
+Provides: iwlwifi-100-ucode = 39.31.5.1-%{iwlwifi_release}
+Provides: iwlwifi-105-ucode = 18.168.6.1-%{iwlwifi_release}
+Provides: iwlwifi-135-ucode = 18.168.6.1-%{iwlwifi_release}
+Provides: iwlwifi-1000-ucode = 39.31.5.1-%{iwlwifi_release}
+Provides: iwlwifi-2000-ucode = 18.168.6.1-%{iwlwifi_release}
+Provides: iwlwifi-2030-ucode = 18.168.6.1-%{iwlwifi_release}
+Provides: iwlwifi-3945-ucode = 15.32.2.9-%{iwlwifi_release}
+Provides: iwlwifi-4965-ucode = 228.61.2.24-%{iwlwifi_release}
+Provides: iwlwifi-5000-ucode = 8.83.5.1-%{iwlwifi_release}
+Provides: iwlwifi-5150-ucode = 8.24.2.2-%{iwlwifi_release}
+Provides: iwlwifi-6000-ucode = 9.221.4.1-%{iwlwifi_release}
+Provides: iwlwifi-6000g2a-ucode = 18.168.6.1-%{iwlwifi_release}
+Provides: iwlwifi-6000g2b-ucode = 18.168.6.1-%{iwlwifi_release}
+Provides: iwlwifi-6050-ucode = 41.28.5.1-%{iwlwifi_release}
+
+%description -n iwlwifi-firmware
+This package containts firmware collection for Intel(R) Wireless WiFi
+Link Series ada
+pter.
+
+%description -n iwlwifi-firmware -l ja
+Intel(R) Wireless WiFi Link
+シリーズの無線LANアダプタ用のファームウェア集です。
+
+
 %prep
 %setup -q -n linux-firmware-%{version} 
 
 %build
-# Remove firmware shipped in separate packages already
-# Perhaps these should be built as subpackages of linux-firmware?
-rm iwlwifi-*.ucode LICENCE.iwlwifi_firmware
-
 # Remove source files we don't need to install
 rm -f usbdux/*dux */*.asm
 
@@ -48,8 +90,18 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc WHENCE LICENCE.* LICENSE.*
 /lib/firmware/*
+%exclude /lib/firmware/iwlwifi*
+
+%files -n iwlwifi-firmware
+%doc WHENCE LICENCE.iwlwifi*
+/lib/firmware/iwlwifi*
 
 %changelog
+* Fri Feb 15 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 20130214-1
+- update to new upstream git master
+- add subpackage to provide iwlwifi-firmware
+  - obsoletes/provides iwlwifi-*-ucode
+
 * Fri Sep 14 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 20120709-2
 - add Obsoletes: ivtv-firmware (included in Vine-5.x main)