- Adjust some ambiguous SPDX license specifications to prevent

spec-cleaner from messing up. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=220
2021-10-26 06:22:34 +00:00 · 2021-10-26 06:22:34 +00:00 · e40481ffbd
commit e40481ffbd
parent 7dfb0b41ce
47 changed files with 264 additions and 165 deletions
--- a/cross-aarch64-gcc7.changes
+++ b/cross-aarch64-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-aarch64-gcc7.spec
+++ b/cross-aarch64-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-aarch64-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-arm-gcc7.changes
+++ b/cross-arm-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-arm-gcc7.spec
+++ b/cross-arm-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-arm-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-arm-none-gcc7-bootstrap.changes
+++ b/cross-arm-none-gcc7-bootstrap.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-arm-none-gcc7-bootstrap.spec
+++ b/cross-arm-none-gcc7-bootstrap.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-arm-none-gcc7-bootstrap
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-arm-none-gcc7.changes
+++ b/cross-arm-none-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-arm-none-gcc7.spec
+++ b/cross-arm-none-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-arm-none-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-avr-gcc7-bootstrap.changes
+++ b/cross-avr-gcc7-bootstrap.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-avr-gcc7-bootstrap.spec
+++ b/cross-avr-gcc7-bootstrap.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-avr-gcc7-bootstrap
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-avr-gcc7.changes
+++ b/cross-avr-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-avr-gcc7.spec
+++ b/cross-avr-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-avr-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-epiphany-gcc7-bootstrap.changes
+++ b/cross-epiphany-gcc7-bootstrap.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-epiphany-gcc7-bootstrap.spec
+++ b/cross-epiphany-gcc7-bootstrap.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-epiphany-gcc7-bootstrap
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-epiphany-gcc7.changes
+++ b/cross-epiphany-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-epiphany-gcc7.spec
+++ b/cross-epiphany-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-epiphany-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-hppa-gcc7.changes
+++ b/cross-hppa-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-hppa-gcc7.spec
+++ b/cross-hppa-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-hppa-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-i386-gcc7.changes
+++ b/cross-i386-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-i386-gcc7.spec
+++ b/cross-i386-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-i386-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-m68k-gcc7.changes
+++ b/cross-m68k-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-m68k-gcc7.spec
+++ b/cross-m68k-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-m68k-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-mips-gcc7.changes
+++ b/cross-mips-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-mips-gcc7.spec
+++ b/cross-mips-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-mips-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-nvptx-gcc7.changes
+++ b/cross-nvptx-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-nvptx-gcc7.spec
+++ b/cross-nvptx-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-nvptx-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-ppc64-gcc7.changes
+++ b/cross-ppc64-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-ppc64-gcc7.spec
+++ b/cross-ppc64-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-ppc64-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-ppc64le-gcc7.changes
+++ b/cross-ppc64le-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-ppc64le-gcc7.spec
+++ b/cross-ppc64le-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-ppc64le-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-rx-gcc7-bootstrap.changes
+++ b/cross-rx-gcc7-bootstrap.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-rx-gcc7-bootstrap.spec
+++ b/cross-rx-gcc7-bootstrap.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-rx-gcc7-bootstrap
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-rx-gcc7.changes
+++ b/cross-rx-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-rx-gcc7.spec
+++ b/cross-rx-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-rx-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-s390x-gcc7.changes
+++ b/cross-s390x-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-s390x-gcc7.spec
+++ b/cross-s390x-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-s390x-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-sparc-gcc7.changes
+++ b/cross-sparc-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-sparc-gcc7.spec
+++ b/cross-sparc-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-sparc-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-sparc64-gcc7.changes
+++ b/cross-sparc64-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-sparc64-gcc7.spec
+++ b/cross-sparc64-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-sparc64-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/cross-x86_64-gcc7.changes
+++ b/cross-x86_64-gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/cross-x86_64-gcc7.spec
+++ b/cross-x86_64-gcc7.spec
@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cross-x86_64-gcc7
 #
 # Copyright (c) 2021 SUSE LLC
 #
--- a/gcc.spec.in
+++ b/gcc.spec.in
@ -360,7 +360,7 @@ Patch125:       gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-re
 Patch126:       gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch
 # GCC-TESTSUITE-DELETE-BEGIN
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 # SRC-COMMON-END
 Summary:	The GNU C Compiler and Support Files
@ -448,7 +448,7 @@ This package contains 64bit support for the GNU Compiler Collection.
 %package devel
 Summary: GCC plugins development enviroment
-License: GPL-3.0+
+License: GPL-3.0-or-later
 Group: Development/Languages/C and C++
 Requires: gcc@base_ver@ = %{version}-%{release}
 Requires: gmp-devel
@ -460,7 +460,7 @@ Files required for developing and compiling GCC plugins.
 %package locale
 Summary:      Locale Data for the GNU Compiler Collection
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:        Development/Languages/C and C++
 Requires: gcc@base_ver@ = %{version}-%{release}
@ -472,7 +472,7 @@ in the current locale.
 # PACKAGE-BEGIN
 %package c++@variant@
 Summary:      The GNU C++ Compiler
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:        Development/Languages/C and C++
 Requires: gcc@base_ver@@variant@ = %{version}-%{release}
 Requires: gcc@base_ver@-c++ = %{version}-%{release}
@ -486,7 +486,7 @@ This package contains the GNU compiler for C++.
 # PACKAGE-BEGIN
 %package -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}@variant@
 Summary:      Include Files and Libraries mandatory for Development
-License:        GPL-3.0 WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:        Development/Languages/C and C++
 Requires: libstdc++%{libstdcxx_sover}@variant@ >= %{version}-%{release}
 Requires: glibc-devel@variant@
@ -503,7 +503,7 @@ library. It is needed for compiling C++ code.
 # PACKAGE-BEGIN
 %package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}@variant@
 Summary:      C compiler runtime library
-License:        GPL-3.0 WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:        System/Base
 Provides:	libgcc_s%{libgcc_s}@variant@ = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -521,7 +521,7 @@ Libgcc is needed for dynamically linked C programs.
 # PACKAGE-BEGIN
 %package -n libgomp%{libgomp_sover}%{libgomp_suffix}@variant@
 Summary:      The GNU compiler collection OpenMP runtime library
-License:        GPL-3.0 WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:        System/Base
 Provides:	libgomp%{libgomp_sover}@variant@ = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -543,7 +543,7 @@ option.
 # PACKAGE-BEGIN
 %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}@variant@
 Summary:      The standard C++ shared library
-License:        GPL-3.0 WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:        System/Libraries
 Suggests:	libstdc++%{libstdcxx_sover}-locale
 Provides:	libstdc++%{libstdcxx_sover}@variant@ = %{version}-%{release}
@ -562,7 +562,7 @@ The standard C++ library, needed for dynamically linked C++ programs.
 %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-locale
 Summary:	Standard C++ Library Locales
-License:	GPL-3.0 WITH GCC-exception-3.1
+License:	GPL-3.0-or-later WITH GCC-exception-3.1
 Group:		System/Libraries
 Provides:	libstdc++%{libstdcxx_sover}-locale = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -590,7 +590,7 @@ and internals documentation.
 # PACKAGE-BEGIN
 %package objc@variant@
 Summary:      GNU Objective C Compiler
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:        Development/Languages/Other
 Requires: gcc@base_ver@@variant@ = %{version}-%{release}
 Requires: gcc@base_ver@-objc = %{version}-%{release}
@ -605,7 +605,7 @@ Nextstep OS. The source code is available in the gcc package.
 # PACKAGE-BEGIN
 %package -n libobjc%{libobjc_sover}%{libobjc_suffix}@variant@
 Summary:      Library for the GNU Objective C Compiler
-License:        GPL-3.0 WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:        Development/Libraries/Other
 Provides:	libobjc%{libobjc_sover}@variant@ = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -623,7 +623,7 @@ The library for the GNU Objective C compiler.
 # PACKAGE-BEGIN
 %package obj-c++@variant@
 Summary:      GNU Objective C++ Compiler
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:        Development/Languages/Other
 Requires: gcc@base_ver@-objc@variant@ = %{version}-%{release}
 Requires: gcc@base_ver@-c++@variant@ = %{version}-%{release}
@ -638,7 +638,7 @@ Nextstep OS. The source code is available in the gcc package.
 %package -n cpp@base_ver@
 Summary:      The GCC Preprocessor
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:        Development/Languages/C and C++
 %description -n cpp@base_ver@
@ -649,7 +649,7 @@ packages.
 # PACKAGE-BEGIN
 %package ada@variant@
 Summary:      GNU Ada Compiler Based on GCC (GNAT)
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:        Development/Languages/Other
 Requires: gcc@base_ver@@variant@ = %{version}-%{release}
 Requires: gcc@base_ver@-ada = %{version}-%{release}
@ -663,7 +663,7 @@ tools based on the GNU GCC technology.
 # PACKAGE-BEGIN
 %package -n libada@base_ver@@variant@
 Summary:      GNU Ada Runtime Libraries
-License:      GPL-3.0 WITH GCC-exception-3.1
+License:      GPL-3.0-or-later WITH GCC-exception-3.1
 Group:        System/Libraries
 Provides: libgnarl-@base_ver@@variant@ = %{version}-%{release}
 Conflicts: %selfconflict libgnarl-@base_ver@@variant@
@ -686,7 +686,7 @@ implementation of Distributed Systems Programming (GLADE) and the Posix
 # PACKAGE-BEGIN
 %package fortran@variant@
 Summary:      The GNU Fortran Compiler and Support Files
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:        Development/Languages/Fortran
 Requires: gcc@base_ver@@variant@ = %{version}-%{release}
 Requires: gcc@base_ver@-fortran = %{version}-%{release}
@ -702,7 +702,7 @@ This is the Fortran compiler of the GNU Compiler Collection (GCC).
 # PACKAGE-BEGIN
 %package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}@variant@
 Summary:      The GNU Fortran Compiler Runtime Library
-License:        GPL-3.0 WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:        Development/Languages/Fortran
 %ifarch %quadmath_arch
 Requires: libquadmath%{libquadmath_sover}@variant@ >= %{version}-%{release}
@ -801,7 +801,7 @@ The runtime library needed to run programs compiled with the
 # PACKAGE-BEGIN
 %package -n libatomic%{libatomic_sover}%{libatomic_suffix}@variant@
 Summary:      The GNU Compiler Atomic Operations Runtime Library
-License:      GPL-3.0 WITH GCC-exception-3.1
+License:      GPL-3.0-or-later WITH GCC-exception-3.1
 Group:        Development/Languages/C and C++
 Provides:	libatomic%{libatomic_sover}@variant@ = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -933,7 +933,7 @@ The runtime library needed to run programs compiled with the
 %package -n libstdc++%{libstdcxx_sover}%{libdevel_suffix}-doc
 Summary:      Documentation for the GNU C++ standard library
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:        Documentation/HTML
 %if 0%{?suse_version} >= 1120
 BuildArch:    noarch
@ -945,7 +945,7 @@ Extensive HTML documentation for the GNU C++ standard library.
 # PACKAGE-BEGIN
 %package go@variant@
 Summary:      GNU Go Compiler
-License:        GPL-3.0+ 
+License:        GPL-3.0-or-later
 Group:        Development/Languages/Other
 Requires: gcc@base_ver@@variant@ = %{version}-%{release}
 Requires: gcc@base_ver@-go = %{version}-%{release}
--- a/gcc7-testresults.changes
+++ b/gcc7-testresults.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/gcc7.changes
+++ b/gcc7.changes
@ -1,3 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 26 06:20:55 UTC 2021 - Richard Biener <rguenther@suse.com>
 - Adjust some ambiguous SPDX license specifications to prevent
  spec-cleaner from messing up.
 -------------------------------------------------------------------
 Mon Oct 25 11:40:00 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
--- a/gcc7.spec
+++ b/gcc7.spec
@ -364,6 +364,8 @@ frontend.
 Language frontends other than C are split to different sub-packages,
 namely gcc-ada, gcc-c++, gcc-fortran, gcc-obj, gcc-obj-c++ and gcc-go.
 %package -n gcc7-32bit
 Summary:        The GNU C Compiler 32bit support
 License:        GPL-3.0-or-later
@ -438,6 +440,7 @@ Requires:       glibc-devel-64bit
 %description -n gcc7-64bit
 This package contains 64bit support for the GNU Compiler Collection.
 %package devel
 Summary:        GCC plugins development enviroment
 License:        GPL-3.0-or-later
@ -449,6 +452,7 @@ Requires:       mpc-devel
 %description devel
 Files required for developing and compiling GCC plugins.
 %package locale
 Summary:        Locale Data for the GNU Compiler Collection
 License:        GPL-3.0-or-later
@ -459,6 +463,7 @@ Requires:       gcc7 = %{version}-%{release}
 Locale data for the GNU Compiler Collection (GCC) to give error message
 in the current locale.
 %package c++
 Summary:        The GNU C++ Compiler
 License:        GPL-3.0-or-later
@ -469,7 +474,6 @@ Requires:       libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix} = %{version}
 %description c++
 This package contains the GNU compiler for C++.
 %package c++-32bit
 Summary:        The GNU C++ Compiler
 License:        GPL-3.0-or-later
@ -480,7 +484,6 @@ Requires:       libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}-32bit = %{ve
 %description c++-32bit
 This package contains the GNU compiler for C++.
 %package c++-64bit
 Summary:        The GNU C++ Compiler
 License:        GPL-3.0-or-later
@ -492,9 +495,10 @@ Requires:       libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}-64bit = %{ve
 %description c++-64bit
 This package contains the GNU compiler for C++.
 %package -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}
 Summary:        Include Files and Libraries mandatory for Development
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Languages/C and C++
 Requires:       glibc-devel
 Requires:       libstdc++%{libstdcxx_sover} >= %{version}-%{release}
@ -505,10 +509,9 @@ Requires:       libunwind-devel
 %description -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}
 This package contains all the headers and libraries of the standard C++
 library. It is needed for compiling C++ code.
 %package -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}-32bit
 Summary:        Include Files and Libraries mandatory for Development
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Languages/C and C++
 Requires:       glibc-devel-32bit
 Requires:       libstdc++%{libstdcxx_sover}-32bit >= %{version}-%{release}
@ -519,10 +522,9 @@ Requires:       libunwind-devel
 %description -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}-32bit
 This package contains all the headers and libraries of the standard C++
 library. It is needed for compiling C++ code.
 %package -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}-64bit
 Summary:        Include Files and Libraries mandatory for Development
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Languages/C and C++
 Requires:       glibc-devel-64bit
 Requires:       libstdc++%{libstdcxx_sover}-64bit >= %{version}-%{release}
@ -534,9 +536,10 @@ Requires:       libunwind-devel
 This package contains all the headers and libraries of the standard C++
 library. It is needed for compiling C++ code.
 %package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}
 Summary:        C compiler runtime library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Base
 Provides:       libgcc_s%{libgcc_s} = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -549,10 +552,9 @@ Libgcc is needed for dynamically linked C programs.
 %post -n libgcc_s%{libgcc_s}%{libgcc_s_suffix} -p /sbin/ldconfig
 %postun -n libgcc_s%{libgcc_s}%{libgcc_s_suffix} -p /sbin/ldconfig
 %package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-32bit
 Summary:        C compiler runtime library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Base
 Provides:       libgcc_s%{libgcc_s}-32bit = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -565,10 +567,9 @@ Libgcc is needed for dynamically linked C programs.
 %post -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-32bit -p /sbin/ldconfig
 %postun -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-32bit -p /sbin/ldconfig
 %package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-64bit
 Summary:        C compiler runtime library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Base
 Provides:       libgcc_s%{libgcc_s}-64bit = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -584,7 +585,7 @@ Libgcc is needed for dynamically linked C programs.
 %package -n libgomp%{libgomp_sover}%{libgomp_suffix}
 Summary:        The GNU compiler collection OpenMP runtime library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Base
 Provides:       libgomp%{libgomp_sover} = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -601,10 +602,9 @@ option.
 %post -n libgomp%{libgomp_sover}%{libgomp_suffix} -p /sbin/ldconfig
 %postun -n libgomp%{libgomp_sover}%{libgomp_suffix} -p /sbin/ldconfig
 %package -n libgomp%{libgomp_sover}%{libgomp_suffix}-32bit
 Summary:        The GNU compiler collection OpenMP runtime library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Base
 Provides:       libgomp%{libgomp_sover}-32bit = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -621,10 +621,9 @@ option.
 %post -n libgomp%{libgomp_sover}%{libgomp_suffix}-32bit -p /sbin/ldconfig
 %postun -n libgomp%{libgomp_sover}%{libgomp_suffix}-32bit -p /sbin/ldconfig
 %package -n libgomp%{libgomp_sover}%{libgomp_suffix}-64bit
 Summary:        The GNU compiler collection OpenMP runtime library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Base
 Provides:       libgomp%{libgomp_sover}-64bit = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -644,7 +643,7 @@ option.
 %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}
 Summary:        The standard C++ shared library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Suggests:       libstdc++%{libstdcxx_sover}-locale
 Provides:       libstdc++%{libstdcxx_sover} = %{version}-%{release}
@ -659,10 +658,9 @@ The standard C++ library, needed for dynamically linked C++ programs.
 %post -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix} -p /sbin/ldconfig
 %postun -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix} -p /sbin/ldconfig
 %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-32bit
 Summary:        The standard C++ shared library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Suggests:       libstdc++%{libstdcxx_sover}-locale
 Provides:       libstdc++%{libstdcxx_sover}-32bit = %{version}-%{release}
@ -677,10 +675,9 @@ The standard C++ library, needed for dynamically linked C++ programs.
 %post -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-32bit -p /sbin/ldconfig
 %postun -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-32bit -p /sbin/ldconfig
 %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-64bit
 Summary:        The standard C++ shared library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Suggests:       libstdc++%{libstdcxx_sover}-locale
 Provides:       libstdc++%{libstdcxx_sover}-64bit = %{version}-%{release}
@ -698,7 +695,7 @@ The standard C++ library, needed for dynamically linked C++ programs.
 %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-locale
 Summary:        Standard C++ Library Locales
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Provides:       libstdc++%{libstdcxx_sover}-locale = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -708,6 +705,7 @@ Conflicts:      %selfconflict libstdc++%{libstdcxx_sover}-locale
 %description -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-locale
 The standard C++ library locale data.
 %package info
 Summary:        Documentation for the GNU compiler collection
 License:        GFDL-1.2-only
@ -721,6 +719,7 @@ BuildArch:      noarch
 GNU info-pages for the GNU compiler collection covering both user-level
 and internals documentation.
 %package objc
 Summary:        GNU Objective C Compiler
 License:        GPL-3.0-or-later
@ -733,7 +732,6 @@ Requires:       libobjc%{libobjc_sover} >= %{version}-%{release}
 This package contains the GNU Objective C compiler. Objective C is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
 %package objc-32bit
 Summary:        GNU Objective C Compiler
 License:        GPL-3.0-or-later
@ -746,7 +744,6 @@ Requires:       libobjc%{libobjc_sover}-32bit >= %{version}-%{release}
 This package contains the GNU Objective C compiler. Objective C is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
 %package objc-64bit
 Summary:        GNU Objective C Compiler
 License:        GPL-3.0-or-later
@ -762,7 +759,7 @@ Nextstep OS. The source code is available in the gcc package.
 %package -n libobjc%{libobjc_sover}%{libobjc_suffix}
 Summary:        Library for the GNU Objective C Compiler
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Libraries/Other
 Provides:       libobjc%{libobjc_sover} = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -775,10 +772,9 @@ The library for the GNU Objective C compiler.
 %post -n libobjc%{libobjc_sover}%{libobjc_suffix} -p /sbin/ldconfig
 %postun -n libobjc%{libobjc_sover}%{libobjc_suffix} -p /sbin/ldconfig
 %package -n libobjc%{libobjc_sover}%{libobjc_suffix}-32bit
 Summary:        Library for the GNU Objective C Compiler
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Libraries/Other
 Provides:       libobjc%{libobjc_sover}-32bit = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -791,10 +787,9 @@ The library for the GNU Objective C compiler.
 %post -n libobjc%{libobjc_sover}%{libobjc_suffix}-32bit -p /sbin/ldconfig
 %postun -n libobjc%{libobjc_sover}%{libobjc_suffix}-32bit -p /sbin/ldconfig
 %package -n libobjc%{libobjc_sover}%{libobjc_suffix}-64bit
 Summary:        Library for the GNU Objective C Compiler
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Libraries/Other
 Provides:       libobjc%{libobjc_sover}-64bit = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -820,7 +815,6 @@ Requires:       gcc7-objc = %{version}-%{release}
 This package contains the GNU Objective C++ compiler. Objective C++ is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
 %package obj-c++-32bit
 Summary:        GNU Objective C++ Compiler
 License:        GPL-3.0-or-later
@ -833,7 +827,6 @@ Requires:       gcc7-objc-32bit = %{version}-%{release}
 This package contains the GNU Objective C++ compiler. Objective C++ is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
 %package obj-c++-64bit
 Summary:        GNU Objective C++ Compiler
 License:        GPL-3.0-or-later
@ -847,6 +840,7 @@ This package contains the GNU Objective C++ compiler. Objective C++ is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
 %package -n cpp7
 Summary:        The GCC Preprocessor
 License:        GPL-3.0-or-later
@ -856,6 +850,7 @@ Group:          Development/Languages/C and C++
 This Package contains just the preprocessor that is used by the X11
 packages.
 %package ada
 Summary:        GNU Ada Compiler Based on GCC (GNAT)
 License:        GPL-3.0-or-later
@ -867,7 +862,6 @@ Requires:       libada7 = %{version}-%{release}
 %description ada
 This package contains an Ada compiler and associated development
 tools based on the GNU GCC technology.
 %package ada-32bit
 Summary:        GNU Ada Compiler Based on GCC (GNAT)
 License:        GPL-3.0-or-later
@ -879,7 +873,6 @@ Requires:       libada7-32bit = %{version}-%{release}
 %description ada-32bit
 This package contains an Ada compiler and associated development
 tools based on the GNU GCC technology.
 %package ada-64bit
 Summary:        GNU Ada Compiler Based on GCC (GNAT)
 License:        GPL-3.0-or-later
@ -894,7 +887,7 @@ tools based on the GNU GCC technology.
 %package -n libada7
 Summary:        GNU Ada Runtime Libraries
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Provides:       libgnarl-7 = %{version}-%{release}
 Conflicts:      %selfconflict libgnarl-7
@ -912,10 +905,9 @@ implementation of Distributed Systems Programming (GLADE) and the Posix
 %post -n libada7 -p /sbin/ldconfig
 %postun -n libada7 -p /sbin/ldconfig
 %package -n libada7-32bit
 Summary:        GNU Ada Runtime Libraries
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Provides:       libgnarl-7-32bit = %{version}-%{release}
 Conflicts:      %selfconflict libgnarl-7-32bit
@ -933,10 +925,9 @@ implementation of Distributed Systems Programming (GLADE) and the Posix
 %post -n libada7-32bit -p /sbin/ldconfig
 %postun -n libada7-32bit -p /sbin/ldconfig
 %package -n libada7-64bit
 Summary:        GNU Ada Runtime Libraries
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Provides:       libgnarl-7-64bit = %{version}-%{release}
 Conflicts:      %selfconflict libgnarl-7-64bit
@ -968,7 +959,6 @@ Requires:       libquadmath%{libquadmath_sover} >= %{version}-%{release}
 %description fortran
 This is the Fortran compiler of the GNU Compiler Collection (GCC).
 %package fortran-32bit
 Summary:        The GNU Fortran Compiler and Support Files
 License:        GPL-3.0-or-later
@ -982,7 +972,6 @@ Requires:       libquadmath%{libquadmath_sover}-32bit >= %{version}-%{release}
 %description fortran-32bit
 This is the Fortran compiler of the GNU Compiler Collection (GCC).
 %package fortran-64bit
 Summary:        The GNU Fortran Compiler and Support Files
 License:        GPL-3.0-or-later
@ -999,7 +988,7 @@ This is the Fortran compiler of the GNU Compiler Collection (GCC).
 %package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}
 Summary:        The GNU Fortran Compiler Runtime Library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Languages/Fortran
 %ifarch %quadmath_arch
 Requires:       libquadmath%{libquadmath_sover} >= %{version}-%{release}
@ -1016,10 +1005,9 @@ of the GNU Compiler Collection (GCC).
 %post -n libgfortran%{libgfortran_sover}%{libgfortran_suffix} -p /sbin/ldconfig
 %postun -n libgfortran%{libgfortran_sover}%{libgfortran_suffix} -p /sbin/ldconfig
 %package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}-32bit
 Summary:        The GNU Fortran Compiler Runtime Library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Languages/Fortran
 %ifarch %quadmath_arch
 Requires:       libquadmath%{libquadmath_sover}-32bit >= %{version}-%{release}
@ -1036,10 +1024,9 @@ of the GNU Compiler Collection (GCC).
 %post -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}-32bit -p /sbin/ldconfig
 %postun -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}-32bit -p /sbin/ldconfig
 %package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}-64bit
 Summary:        The GNU Fortran Compiler Runtime Library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Languages/Fortran
 %ifarch %quadmath_arch
 Requires:       libquadmath%{libquadmath_sover}-64bit >= %{version}-%{release}
@ -1074,7 +1061,6 @@ operations.
 %post -n libquadmath%{libquadmath_sover}%{libquadmath_suffix} -p /sbin/ldconfig
 %postun -n libquadmath%{libquadmath_sover}%{libquadmath_suffix} -p /sbin/ldconfig
 %package -n libquadmath%{libquadmath_sover}%{libquadmath_suffix}-32bit
 Summary:        The GNU Fortran Compiler Quadmath Runtime Library
 License:        LGPL-2.1-only
@ -1092,7 +1078,6 @@ operations.
 %post -n libquadmath%{libquadmath_sover}%{libquadmath_suffix}-32bit -p /sbin/ldconfig
 %postun -n libquadmath%{libquadmath_sover}%{libquadmath_suffix}-32bit -p /sbin/ldconfig
 %package -n libquadmath%{libquadmath_sover}%{libquadmath_suffix}-64bit
 Summary:        The GNU Fortran Compiler Quadmath Runtime Library
 License:        LGPL-2.1-only
@ -1127,7 +1112,6 @@ The runtime library needed to run programs compiled with the
 %post -n libitm%{libitm_sover}%{libitm_suffix} -p /sbin/ldconfig
 %postun -n libitm%{libitm_sover}%{libitm_suffix} -p /sbin/ldconfig
 %package -n libitm%{libitm_sover}%{libitm_suffix}-32bit
 Summary:        The GNU Compiler Transactional Memory Runtime Library
 License:        MIT
@ -1144,7 +1128,6 @@ The runtime library needed to run programs compiled with the
 %post -n libitm%{libitm_sover}%{libitm_suffix}-32bit -p /sbin/ldconfig
 %postun -n libitm%{libitm_sover}%{libitm_suffix}-32bit -p /sbin/ldconfig
 %package -n libitm%{libitm_sover}%{libitm_suffix}-64bit
 Summary:        The GNU Compiler Transactional Memory Runtime Library
 License:        MIT
@ -1178,7 +1161,6 @@ The runtime library needed to run programs compiled with the
 %post -n libasan%{libasan_sover}%{libasan_suffix} -p /sbin/ldconfig
 %postun -n libasan%{libasan_sover}%{libasan_suffix} -p /sbin/ldconfig
 %package -n libasan%{libasan_sover}%{libasan_suffix}-32bit
 Summary:        The GNU Compiler Address Sanitizer Runtime Library
 License:        MIT
@ -1195,7 +1177,6 @@ The runtime library needed to run programs compiled with the
 %post -n libasan%{libasan_sover}%{libasan_suffix}-32bit -p /sbin/ldconfig
 %postun -n libasan%{libasan_sover}%{libasan_suffix}-32bit -p /sbin/ldconfig
 %package -n libasan%{libasan_sover}%{libasan_suffix}-64bit
 Summary:        The GNU Compiler Address Sanitizer Runtime Library
 License:        MIT
@ -1229,7 +1210,6 @@ The runtime library needed to run programs compiled with the
 %post -n libtsan%{libtsan_sover}%{libtsan_suffix} -p /sbin/ldconfig
 %postun -n libtsan%{libtsan_sover}%{libtsan_suffix} -p /sbin/ldconfig
 %package -n libtsan%{libtsan_sover}%{libtsan_suffix}-32bit
 Summary:        The GNU Compiler Thread Sanitizer Runtime Library
 License:        MIT
@ -1246,7 +1226,6 @@ The runtime library needed to run programs compiled with the
 %post -n libtsan%{libtsan_sover}%{libtsan_suffix}-32bit -p /sbin/ldconfig
 %postun -n libtsan%{libtsan_sover}%{libtsan_suffix}-32bit -p /sbin/ldconfig
 %package -n libtsan%{libtsan_sover}%{libtsan_suffix}-64bit
 Summary:        The GNU Compiler Thread Sanitizer Runtime Library
 License:        MIT
@ -1266,7 +1245,7 @@ The runtime library needed to run programs compiled with the
 %package -n libatomic%{libatomic_sover}%{libatomic_suffix}
 Summary:        The GNU Compiler Atomic Operations Runtime Library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Languages/C and C++
 Provides:       libatomic%{libatomic_sover} = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -1279,10 +1258,9 @@ The runtime library for atomic operations of the GNU Compiler Collection (GCC).
 %post -n libatomic%{libatomic_sover}%{libatomic_suffix} -p /sbin/ldconfig
 %postun -n libatomic%{libatomic_sover}%{libatomic_suffix} -p /sbin/ldconfig
 %package -n libatomic%{libatomic_sover}%{libatomic_suffix}-32bit
 Summary:        The GNU Compiler Atomic Operations Runtime Library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Languages/C and C++
 Provides:       libatomic%{libatomic_sover}-32bit = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -1295,10 +1273,9 @@ The runtime library for atomic operations of the GNU Compiler Collection (GCC).
 %post -n libatomic%{libatomic_sover}%{libatomic_suffix}-32bit -p /sbin/ldconfig
 %postun -n libatomic%{libatomic_sover}%{libatomic_suffix}-32bit -p /sbin/ldconfig
 %package -n libatomic%{libatomic_sover}%{libatomic_suffix}-64bit
 Summary:        The GNU Compiler Atomic Operations Runtime Library
-License:        GPL-3.0-only WITH GCC-exception-3.1
+License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          Development/Languages/C and C++
 Provides:       libatomic%{libatomic_sover}-64bit = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
@ -1328,7 +1305,6 @@ The runtime library needed to run programs compiled with the
 %post -n libcilkrts%{libcilkrts_sover}%{libcilkrts_suffix} -p /sbin/ldconfig
 %postun -n libcilkrts%{libcilkrts_sover}%{libcilkrts_suffix} -p /sbin/ldconfig
 %package -n libcilkrts%{libcilkrts_sover}%{libcilkrts_suffix}-32bit
 Summary:        The GNU Compiler Cilk+ Runtime Library
 License:        MIT
@ -1345,7 +1321,6 @@ The runtime library needed to run programs compiled with the
 %post -n libcilkrts%{libcilkrts_sover}%{libcilkrts_suffix}-32bit -p /sbin/ldconfig
 %postun -n libcilkrts%{libcilkrts_sover}%{libcilkrts_suffix}-32bit -p /sbin/ldconfig
 %package -n libcilkrts%{libcilkrts_sover}%{libcilkrts_suffix}-64bit
 Summary:        The GNU Compiler Cilk+ Runtime Library
 License:        MIT
@ -1379,7 +1354,6 @@ The runtime library needed to run programs compiled with the
 %post -n liblsan%{liblsan_sover}%{liblsan_suffix} -p /sbin/ldconfig
 %postun -n liblsan%{liblsan_sover}%{liblsan_suffix} -p /sbin/ldconfig
 %package -n liblsan%{liblsan_sover}%{liblsan_suffix}-32bit
 Summary:        The GNU Compiler Leak Sanitizer Runtime Library
 License:        MIT
@ -1396,7 +1370,6 @@ The runtime library needed to run programs compiled with the
 %post -n liblsan%{liblsan_sover}%{liblsan_suffix}-32bit -p /sbin/ldconfig
 %postun -n liblsan%{liblsan_sover}%{liblsan_suffix}-32bit -p /sbin/ldconfig
 %package -n liblsan%{liblsan_sover}%{liblsan_suffix}-64bit
 Summary:        The GNU Compiler Leak Sanitizer Runtime Library
 License:        MIT
@ -1430,7 +1403,6 @@ The runtime library needed to run programs compiled with the
 %post -n libubsan%{libubsan_sover}%{libubsan_suffix} -p /sbin/ldconfig
 %postun -n libubsan%{libubsan_sover}%{libubsan_suffix} -p /sbin/ldconfig
 %package -n libubsan%{libubsan_sover}%{libubsan_suffix}-32bit
 Summary:        The GNU Compiler Undefined Sanitizer Runtime Library
 License:        MIT
@ -1447,7 +1419,6 @@ The runtime library needed to run programs compiled with the
 %post -n libubsan%{libubsan_sover}%{libubsan_suffix}-32bit -p /sbin/ldconfig
 %postun -n libubsan%{libubsan_sover}%{libubsan_suffix}-32bit -p /sbin/ldconfig
 %package -n libubsan%{libubsan_sover}%{libubsan_suffix}-64bit
 Summary:        The GNU Compiler Undefined Sanitizer Runtime Library
 License:        MIT
@ -1481,7 +1452,6 @@ The runtime library needed to run programs compiled with the
 %post -n libvtv%{libvtv_sover}%{libvtv_suffix} -p /sbin/ldconfig
 %postun -n libvtv%{libvtv_sover}%{libvtv_suffix} -p /sbin/ldconfig
 %package -n libvtv%{libvtv_sover}%{libvtv_suffix}-32bit
 Summary:        The GNU Compiler Vtable Verifier Runtime Library
 License:        MIT
@ -1498,7 +1468,6 @@ The runtime library needed to run programs compiled with the
 %post -n libvtv%{libvtv_sover}%{libvtv_suffix}-32bit -p /sbin/ldconfig
 %postun -n libvtv%{libvtv_sover}%{libvtv_suffix}-32bit -p /sbin/ldconfig
 %package -n libvtv%{libvtv_sover}%{libvtv_suffix}-64bit
 Summary:        The GNU Compiler Vtable Verifier Runtime Library
 License:        MIT
@ -1532,7 +1501,6 @@ The runtime library needed to run programs compiled with the
 %post -n libmpx%{libmpx_sover}%{libmpx_suffix} -p /sbin/ldconfig
 %postun -n libmpx%{libmpx_sover}%{libmpx_suffix} -p /sbin/ldconfig
 %package -n libmpx%{libmpx_sover}%{libmpx_suffix}-32bit
 Summary:        The GNU Compiler MPX Runtime Library
 License:        BSD-3-Clause
@ -1549,7 +1517,6 @@ The runtime library needed to run programs compiled with the
 %post -n libmpx%{libmpx_sover}%{libmpx_suffix}-32bit -p /sbin/ldconfig
 %postun -n libmpx%{libmpx_sover}%{libmpx_suffix}-32bit -p /sbin/ldconfig
 %package -n libmpx%{libmpx_sover}%{libmpx_suffix}-64bit
 Summary:        The GNU Compiler MPX Runtime Library
 License:        BSD-3-Clause
@ -1583,7 +1550,6 @@ The runtime library needed to run programs compiled with the
 %post -n libmpxwrappers%{libmpxwrappers_sover}%{libmpxwrappers_suffix} -p /sbin/ldconfig
 %postun -n libmpxwrappers%{libmpxwrappers_sover}%{libmpxwrappers_suffix} -p /sbin/ldconfig
 %package -n libmpxwrappers%{libmpxwrappers_sover}%{libmpxwrappers_suffix}-32bit
 Summary:        The GNU Compiler MPX Runtime Library
 License:        BSD-3-Clause
@ -1600,7 +1566,6 @@ The runtime library needed to run programs compiled with the
 %post -n libmpxwrappers%{libmpxwrappers_sover}%{libmpxwrappers_suffix}-32bit -p /sbin/ldconfig
 %postun -n libmpxwrappers%{libmpxwrappers_sover}%{libmpxwrappers_suffix}-32bit -p /sbin/ldconfig
 %package -n libmpxwrappers%{libmpxwrappers_sover}%{libmpxwrappers_suffix}-64bit
 Summary:        The GNU Compiler MPX Runtime Library
 License:        BSD-3-Clause
@ -1640,7 +1605,6 @@ Requires:       libgo%{libgo_sover} >= %{version}-%{release}
 %description go
 This package contains a Go compiler and associated development
 files based on the GNU GCC technology.
 %package go-32bit
 Summary:        GNU Go Compiler
 License:        GPL-3.0-or-later
@ -1652,7 +1616,6 @@ Requires:       libgo%{libgo_sover}-32bit >= %{version}-%{release}
 %description go-32bit
 This package contains a Go compiler and associated development
 files based on the GNU GCC technology.
 %package go-64bit
 Summary:        GNU Go Compiler
 License:        GPL-3.0-or-later
@ -1680,7 +1643,6 @@ Runtime library for the GNU Go language.
 %post -n libgo%{libgo_sover}%{libgo_suffix} -p /sbin/ldconfig
 %postun -n libgo%{libgo_sover}%{libgo_suffix} -p /sbin/ldconfig
 %package -n libgo%{libgo_sover}%{libgo_suffix}-32bit
 Summary:        GNU Go compiler runtime library
 License:        BSD-3-Clause
@ -1696,7 +1658,6 @@ Runtime library for the GNU Go language.
 %post -n libgo%{libgo_sover}%{libgo_suffix}-32bit -p /sbin/ldconfig
 %postun -n libgo%{libgo_sover}%{libgo_suffix}-32bit -p /sbin/ldconfig
 %package -n libgo%{libgo_sover}%{libgo_suffix}-64bit
 Summary:        GNU Go compiler runtime library
 License:        BSD-3-Clause