From 6038df8c47e7dedc5996f9c72058e9ca015adc62 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Feb 09 2018 08:05:02 +0000 Subject: Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- diff --git a/linux-firmware.spec b/linux-firmware.spec index 34a249e..905a0ed 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -6,7 +6,7 @@ Name: linux-firmware Version: 20171215 -Release: %{firmware_release}.git%{checkout}%{?dist} +Release: %{firmware_release}.git%{checkout}%{?dist}.1 Summary: Firmware files used by the Linux kernel License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted URL: http://www.kernel.org/ @@ -40,7 +40,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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl100-firmware < 39.31.5.1-4 %description -n iwl100-firmware This package contains the firmware required by the Intel wireless drivers @@ -52,7 +52,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} +Release: %{firmware_release}%{?dist}.1 %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 @@ -63,7 +63,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} +Release: %{firmware_release}%{?dist}.1 %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 @@ -75,7 +75,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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl1000-firmware < 1:39.31.5.1-3 %description -n iwl1000-firmware This package contains the firmware required by the Intel wireless drivers @@ -87,7 +87,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} +Release: %{firmware_release}%{?dist}.1 %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 @@ -98,7 +98,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} +Release: %{firmware_release}%{?dist}.1 %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 @@ -110,7 +110,7 @@ Summary: Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters License: Redistributable, no modification permitted Epoch: 1 Version: 25.30.13.0 -Release: %{firmware_release}%{?dist} +Release: %{firmware_release}%{?dist}.1 %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 @@ -120,7 +120,7 @@ contained inside the provided 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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl3945-firmware < 15.32.2.9-7 %description -n iwl3945-firmware This package contains the firmware required by the iwl3945 driver @@ -131,7 +131,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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl4965-firmware < 228.61.2.24-5 %description -n iwl4965-firmware This package contains the firmware required by the iwl4965 driver @@ -142,7 +142,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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl5000-firmware < 8.83.5.1_1-3 %description -n iwl5000-firmware This package contains the firmware required by the iwl5000 driver @@ -153,7 +153,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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl5150-firmware < 8.24.2.2-4 %description -n iwl5150-firmware This package contains the firmware required by the iwl5150 driver @@ -164,7 +164,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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl6000-firmware < 9.221.4.1-4 %description -n iwl6000-firmware This package contains the firmware required by the Intel wireless drivers @@ -175,7 +175,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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl6000g2a-firmware < 17.168.5.3-3 %description -n iwl6000g2a-firmware This package contains the firmware required by the Intel wireless drivers @@ -186,7 +186,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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl6000g2b-firmware < 17.168.5.2-3 %description -n iwl6000g2b-firmware This package contains the firmware required by the Intel wireless drivers @@ -197,7 +197,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} +Release: %{firmware_release}%{?dist}.1 Obsoletes: iwl6050-firmware < 41.28.5.1-5 %description -n iwl6050-firmware This package contains the firmware required by the Intel wireless drivers @@ -209,7 +209,7 @@ Summary: Firmware for Intel(R) Wireless WiFi Link 726x/8000/9000 Series Adapters License: Redistributable, no modification permitted Epoch: 1 Version: 25.30.13.0 -Release: %{firmware_release}%{?dist} +Release: %{firmware_release}%{?dist}.1 %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 @@ -398,6 +398,9 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %license WHENCE LICENCE.* LICENSE.* %changelog +* Fri Feb 09 2018 Igor Gnatenko - 20171215-82.git2451bb22.1 +- Escape macros in %%changelog + * Fri Jan 05 2018 Josh Boyer 20171215-92.git2451bb22 - Add amd-ucode for fam17h @@ -622,7 +625,7 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files * Mon May 20 2013 Kyle McMartin - 20130418-25.gitb584174 - Use a common version number for both the iwl*-firmware packages and linux-firmware itself. -- Don't reference old kernel-firmware package in %description +- Don't reference old kernel-firmware package in %%description * Mon May 20 2013 Kyle McMartin - 20130418-0.3.gitb584174 - Bump iwl* version numbers as well...