Update to latest upstream git snapshot

- Adjust iwl{3160,7260} version numbers (rhbz 1167695)
This commit is contained in:
Josh Boyer 2015-01-15 14:14:42 -05:00
parent fb8a7616b7
commit 38993c8a1d
3 changed files with 14 additions and 6 deletions

1
.gitignore vendored
View File

@ -23,3 +23,4 @@ linux-firmware-20100806.tar.bz2
/linux-firmware-20140828.tar.gz /linux-firmware-20140828.tar.gz
/linux-firmware-20140912.tar.gz /linux-firmware-20140912.tar.gz
/linux-firmware-20141013.tar.gz /linux-firmware-20141013.tar.gz
/linux-firmware-20150115.tar.gz

View File

@ -1,10 +1,10 @@
%global checkout 0e5f6377 %global checkout 78535e88
%global firmware_release 43 %global firmware_release 44
%global _firmwarepath /usr/lib/firmware %global _firmwarepath /usr/lib/firmware
Name: linux-firmware Name: linux-firmware
Version: 20141013 Version: 20150115
Release: %{firmware_release}.git%{checkout}%{?dist} Release: %{firmware_release}.git%{checkout}%{?dist}
Summary: Firmware files used by the Linux kernel Summary: Firmware files used by the Linux kernel
@ -193,7 +193,8 @@ contained inside the provided LICENSE file. Please read it carefully.
%package -n iwl7260-firmware %package -n iwl7260-firmware
Summary: Firmware for Intel(R) Wireless WiFi Link 7260 Series Adapters Summary: Firmware for Intel(R) Wireless WiFi Link 7260 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 25.222.9.0 Epoch: 1
Version: 23.11.10.0
Release: %{firmware_release}%{?dist} Release: %{firmware_release}%{?dist}
%description -n iwl7260-firmware %description -n iwl7260-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
@ -203,7 +204,8 @@ contained inside the provided LICENSE file. Please read it carefully.
%package -n iwl3160-firmware %package -n iwl3160-firmware
Summary: Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters Summary: Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 25.222.9.0 Epoch: 1
Version: 23.11.10.0
Release: %{firmware_release}%{?dist} Release: %{firmware_release}%{?dist}
%description -n iwl3160-firmware %description -n iwl3160-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
@ -369,6 +371,7 @@ rm -rf $RPM_BUILD_ROOT
%doc WHENCE LICENCE.iwlwifi_firmware %doc WHENCE LICENCE.iwlwifi_firmware
%{_firmwarepath}/iwlwifi-7260-*.ucode %{_firmwarepath}/iwlwifi-7260-*.ucode
%{_firmwarepath}/iwlwifi-7265-*.ucode %{_firmwarepath}/iwlwifi-7265-*.ucode
%{_firmwarepath}/iwlwifi-7265D-*.ucode
%files -n iwl3160-firmware %files -n iwl3160-firmware
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -405,6 +408,10 @@ rm -rf $RPM_BUILD_ROOT
%doc WHENCE LICENCE.* LICENSE.* %doc WHENCE LICENCE.* LICENSE.*
%changelog %changelog
* Thu Jan 15 2015 Josh Boyer <jwboyer@fedoraproject.org> 20150115-44.git78535e88.fc22
- Update to latest upstream git snapshot
- Adjust iwl{3160,7260} version numbers (rhbz 1167695)
* Tue Oct 14 2014 Josh Boyer <jwboyer@fedoraproject.org> 20141013-43.git0e5f6377.fc22 * Tue Oct 14 2014 Josh Boyer <jwboyer@fedoraproject.org> 20141013-43.git0e5f6377.fc22
- Fix 3160/7260 version numbers (rhbz 1110522) - Fix 3160/7260 version numbers (rhbz 1110522)

View File

@ -1 +1 @@
d8198305f6c15fa23b8eea6e1537a2e4 linux-firmware-20141013.tar.gz dbf64c7fa8c246e0f41b76aec3e62ee6 linux-firmware-20150115.tar.gz