From 4a823c77184be17abee3373bb662678bb0f53cc3 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Thu, 28 Aug 2014 13:28:51 -0400 Subject: [PATCH] Update to latest upstream git snapshot for new radeon firmware (rhbz 1130738) - Fix versioning after mass rebuild and for iwl5000-firmware (rhbz 1130979) --- .gitignore | 1 + linux-firmware.spec | 46 ++++++++++++++++++++++++--------------------- sources | 2 +- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 6135ffc..d68a00a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ linux-firmware-20100806.tar.bz2 /linux-firmware-20140317.tar.gz /linux-firmware-20140605.tar.gz /linux-firmware-20140808.tar.gz +/linux-firmware-20140828.tar.gz diff --git a/linux-firmware.spec b/linux-firmware.spec index 5dd4b7a..6bfac01 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,11 +1,11 @@ -%global checkout ce64fa89 -%global firmware_release 39 +%global checkout 13eb2086 +%global firmware_release 40 %global _firmwarepath /usr/lib/firmware Name: linux-firmware -Version: 20140808 -Release: %{firmware_release}.git%{checkout}%{?dist}.1 +Version: 20140828 +Release: %{firmware_release}.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel Group: System Environment/Kernel @@ -37,7 +37,7 @@ operate. Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters License: Redistributable, no modification permitted Version: 39.31.5.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl100-firmware < 39.31.5.1-4 %description -n iwl100-firmware This package contains the firmware required by the Intel wireless drivers @@ -49,7 +49,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 105 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} %description -n iwl105-firmware This package contains the firmware required by the Intel wireless drivers for Linux to support the iwl105 hardware. Usage of the firmware @@ -60,7 +60,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 135 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} %description -n iwl135-firmware This package contains the firmware required by the Intel wireless drivers for Linux to support the iwl135 hardware. Usage of the firmware @@ -72,7 +72,7 @@ Summary: Firmware for Intel® PRO/Wireless 1000 B/G/N network adaptors License: Redistributable, no modification permitted Version: 39.31.5.1 Epoch: 1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl1000-firmware < 1:39.31.5.1-3 %description -n iwl1000-firmware This package contains the firmware required by the Intel wireless drivers @@ -84,7 +84,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 2000 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} %description -n iwl2000-firmware This package contains the firmware required by the Intel wireless drivers for Linux to support the iwl2000 hardware. Usage of the firmware @@ -95,7 +95,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 2030 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} %description -n iwl2030-firmware This package contains the firmware required by the Intel wireless drivers for Linux to support the iwl2030 hardware. Usage of the firmware @@ -106,7 +106,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 3945 A/B/G network adaptors License: Redistributable, no modification permitted Version: 15.32.2.9 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl3945-firmware < 15.32.2.9-7 %description -n iwl3945-firmware This package contains the firmware required by the iwl3945 driver @@ -117,7 +117,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 4965 A/G/N network adaptors License: Redistributable, no modification permitted Version: 228.61.2.24 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl4965-firmware < 228.61.2.24-5 %description -n iwl4965-firmware This package contains the firmware required by the iwl4965 driver @@ -127,8 +127,8 @@ contained inside the provided LICENSE file. Please read it carefully. %package -n iwl5000-firmware Summary: Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors License: Redistributable, no modification permitted -Version: 8.83.5.1 -Release: %{firmware_release}%{?dist}.1 +Version: 8.83.5.1_1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl5000-firmware < 8.83.5.1_1-3 %description -n iwl5000-firmware This package contains the firmware required by the iwl5000 driver @@ -139,7 +139,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 5150 A/G/N network adaptors License: Redistributable, no modification permitted Version: 8.24.2.2 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl5150-firmware < 8.24.2.2-4 %description -n iwl5150-firmware This package contains the firmware required by the iwl5150 driver @@ -150,7 +150,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6000 AGN Adapter License: Redistributable, no modification permitted Version: 9.221.4.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl6000-firmware < 9.221.4.1-4 %description -n iwl6000-firmware This package contains the firmware required by the Intel wireless drivers @@ -161,7 +161,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6005 Series Adapters License: Redistributable, no modification permitted Version: 17.168.5.3 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl6000g2a-firmware < 17.168.5.3-3 %description -n iwl6000g2a-firmware This package contains the firmware required by the Intel wireless drivers @@ -172,7 +172,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6030 Series Adapters License: Redistributable, no modification permitted Version: 17.168.5.2 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl6000g2b-firmware < 17.168.5.2-3 %description -n iwl6000g2b-firmware This package contains the firmware required by the Intel wireless drivers @@ -183,7 +183,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6050 Series Adapters License: Redistributable, no modification permitted Version: 41.28.5.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Obsoletes: iwl6050-firmware < 41.28.5.1-5 %description -n iwl6050-firmware This package contains the firmware required by the Intel wireless drivers @@ -194,7 +194,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 7260 Series Adapters License: Redistributable, no modification permitted Version: 23.214.9.0 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} %description -n iwl7260-firmware This package contains the firmware required by the Intel wireless drivers for Linux. Usage of the firmware is subject to the terms and conditions @@ -204,7 +204,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters License: Redistributable, no modification permitted Version: 23.214.9.0 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} %description -n iwl3160-firmware This package contains the firmware required by the Intel wireless drivers for Linux. Usage of the firmware is subject to the terms and conditions @@ -405,6 +405,10 @@ rm -rf $RPM_BUILD_ROOT %doc WHENCE LICENCE.* LICENSE.* %changelog +* Thu Aug 28 2014 Josh Boyer +- Update to latest upstream git snapshot for new radeon firmware (rhbz 1130738) +- Fix versioning after mass rebuild and for iwl5000-firmware (rhbz 1130979) + * Fri Aug 08 2014 Kyle McMartin 20140808-39.gitce64fa89.1 - Update from upstream linux-firmware. - Nuke unapplied radeon patches. diff --git a/sources b/sources index 819005e..d4ea3e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6e2ff4156a3963947c95c152947544f linux-firmware-20140808.tar.gz +42459b7c7ba0f9c98ea825c2a1b68aff linux-firmware-20140828.tar.gz