diff --git a/linux-firmware.spec b/linux-firmware.spec index d5f621c..46ebd3e 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,11 +1,11 @@ %global checkout 3161bfa4 -%global firmware_release 52 +%global firmware_release 53 %global _firmwarepath /usr/lib/firmware Name: linux-firmware Version: 20150521 -Release: %{firmware_release}.git%{checkout}%{?dist}.1 +Release: %{firmware_release}.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel Group: System Environment/Kernel @@ -25,7 +25,6 @@ Obsoletes: ql2400-firmware < 5.08.00-2 Obsoletes: ql2500-firmware < 5.08.00-2 Obsoletes: rt61pci-firmware < 1.2-11 Obsoletes: rt73usb-firmware < 1.8-11 -Obsoletes: ivtv-firmware < 2:20080701-27 Obsoletes: cx18-firmware < 20080628-10 Conflicts: microcode_ctl < 2.1-0 @@ -39,7 +38,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 @@ -51,7 +50,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 @@ -62,7 +61,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 @@ -74,7 +73,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 @@ -86,7 +85,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 @@ -97,7 +96,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 @@ -108,7 +107,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 @@ -119,7 +118,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 @@ -130,7 +129,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors License: Redistributable, no modification permitted Version: 8.83.5.1_1 -Release: %{firmware_release}%{?dist}.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 @@ -141,7 +140,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 @@ -152,7 +151,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 @@ -163,7 +162,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: 18.168.6.1 -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 @@ -174,7 +173,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: 18.168.6.1 -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 @@ -185,7 +184,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 @@ -197,7 +196,7 @@ Summary: Firmware for Intel(R) Wireless WiFi Link 7260 Series Adapters License: Redistributable, no modification permitted Epoch: 1 Version: 25.17.12.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 @@ -208,7 +207,7 @@ Summary: Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters License: Redistributable, no modification permitted Epoch: 1 Version: 25.17.12.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 @@ -408,6 +407,9 @@ rm -rf $RPM_BUILD_ROOT %doc WHENCE LICENCE.* LICENSE.* %changelog +* Tue Jun 23 2015 Josh Boyer 20150521-53.git3161bfa4 +- Don't obsolete ivtv-firmware any longer (rhbz 1232773) + * Wed Jun 17 2015 Fedora Release Engineering - 20150521-52.git3161bfa4.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild