Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gcc10 for openSUSE:Factory checked
in at 2021-02-11 12:44:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gcc10 (Old)
and /work/SRC/openSUSE:Factory/.gcc10.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcc10"
Thu Feb 11 12:44:38 2021 rev:11 rq:868872 version:10.2.1+git1030
Changes:
--------
--- /work/SRC/openSUSE:Factory/gcc10/cross-aarch64-gcc10.changes
2020-12-07 14:59:55.492686230 +0100
+++ /work/SRC/openSUSE:Factory/.gcc10.new.28504/cross-aarch64-gcc10.changes
2021-02-11 12:44:44.269257419 +0100
@@ -1,0 +2,6 @@
+Wed Feb 3 09:27:45 UTC 2021 - Richard Biener <rguent...@suse.com>
+
+- Remove include-fixed/pthread.h
+- Change GCC exception licenses to SPDX format
+
+-------------------------------------------------------------------
@@ -36,0 +43,6 @@
+
+-------------------------------------------------------------------
+Thu Oct 29 10:57:04 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge: Install libgcc_s into %_libdir. ABI wise it
+ stays /%lib. (boo#1029961)
cross-amdgcn-gcc10.changes: same change
cross-arm-gcc10.changes: same change
cross-arm-none-gcc10-bootstrap.changes: same change
cross-arm-none-gcc10.changes: same change
cross-avr-gcc10-bootstrap.changes: same change
cross-avr-gcc10.changes: same change
cross-epiphany-gcc10-bootstrap.changes: same change
cross-epiphany-gcc10.changes: same change
cross-hppa-gcc10.changes: same change
cross-i386-gcc10.changes: same change
cross-m68k-gcc10.changes: same change
cross-mips-gcc10.changes: same change
cross-nvptx-gcc10.changes: same change
cross-ppc64-gcc10.changes: same change
cross-ppc64le-gcc10.changes: same change
cross-riscv64-elf-gcc10-bootstrap.changes: same change
cross-riscv64-elf-gcc10.changes: same change
cross-riscv64-gcc10.changes: same change
cross-rx-gcc10-bootstrap.changes: same change
cross-rx-gcc10.changes: same change
cross-s390x-gcc10.changes: same change
cross-sparc-gcc10.changes: same change
cross-sparc64-gcc10.changes: same change
cross-x86_64-gcc10.changes: same change
gcc10-testresults.changes: same change
gcc10.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cross-aarch64-gcc10.spec ++++++
--- /var/tmp/diff_new_pack.aZtYol/_old 2021-02-11 12:45:05.273288000 +0100
+++ /var/tmp/diff_new_pack.aZtYol/_new 2021-02-11 12:45:05.277288006 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cross-aarch64-gcc10
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
cross-amdgcn-gcc10.spec: same change
cross-arm-gcc10.spec: same change
cross-arm-none-gcc10-bootstrap.spec: same change
cross-arm-none-gcc10.spec: same change
cross-avr-gcc10-bootstrap.spec: same change
cross-avr-gcc10.spec: same change
cross-epiphany-gcc10-bootstrap.spec: same change
cross-epiphany-gcc10.spec: same change
cross-hppa-gcc10.spec: same change
cross-i386-gcc10.spec: same change
cross-m68k-gcc10.spec: same change
cross-mips-gcc10.spec: same change
cross-nvptx-gcc10.spec: same change
cross-ppc64-gcc10.spec: same change
cross-ppc64le-gcc10.spec: same change
cross-riscv64-elf-gcc10-bootstrap.spec: same change
cross-riscv64-elf-gcc10.spec: same change
cross-riscv64-gcc10.spec: same change
cross-rx-gcc10-bootstrap.spec: same change
cross-rx-gcc10.spec: same change
cross-s390x-gcc10.spec: same change
cross-sparc-gcc10.spec: same change
cross-sparc64-gcc10.spec: same change
cross-x86_64-gcc10.spec: same change
++++++ gcc10-testresults.spec ++++++
--- /var/tmp/diff_new_pack.aZtYol/_old 2021-02-11 12:45:05.969289013 +0100
+++ /var/tmp/diff_new_pack.aZtYol/_new 2021-02-11 12:45:05.973289019 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gcc10-testresults
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,16 @@
# nospeccleaner
+%if !0%{?usrmerged}
+%define _slibdir /%{_lib}
+%define slibdir /lib
+%define slibdir64 /lib64
+%else
+%define _slibdir %{_libdir}
+%define slibdir %{_prefix}/lib
+%define slibdir64 %{_libdir}
+%endif
+
# Ada currently fails to build on a few platforms, enable it only
# on those that work
%if %{suse_version} >= 1310
++++++ gcc10.spec ++++++
--- /var/tmp/diff_new_pack.aZtYol/_old 2021-02-11 12:45:05.993289048 +0100
+++ /var/tmp/diff_new_pack.aZtYol/_new 2021-02-11 12:45:05.997289054 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gcc10
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,6 +18,16 @@
# nospeccleaner
+%if !0%{?usrmerged}
+%define _slibdir /%{_lib}
+%define slibdir /lib
+%define slibdir64 /lib64
+%else
+%define _slibdir %{_libdir}
+%define slibdir %{_prefix}/lib
+%define slibdir64 %{_libdir}
+%endif
+
# Ada currently fails to build on a few platforms, enable it only
# on those that work
%if %{suse_version} >= 1310
@@ -464,7 +474,7 @@
%package -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}
Summary: Include Files and Libraries mandatory for Development
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: Development/Languages/C and C++
Requires: glibc-devel
Requires: libstdc++%{libstdcxx_sover} >= %{version}-%{release}
@@ -481,7 +491,7 @@
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-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: Development/Languages/C and C++
Requires: glibc-devel-32bit
Requires: libstdc++%{libstdcxx_sover}-32bit >= %{version}-%{release}
@@ -498,7 +508,7 @@
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-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: Development/Languages/C and C++
Requires: glibc-devel-64bit
Requires: libstdc++%{libstdcxx_sover}-64bit >= %{version}-%{release}
@@ -572,7 +582,7 @@
%package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}
Summary: C compiler runtime library
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 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
@@ -587,7 +597,7 @@
%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-with-GCC-exception
+License: GPL-3.0 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
@@ -602,7 +612,7 @@
%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-with-GCC-exception
+License: GPL-3.0 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
@@ -618,7 +628,7 @@
%package -n libgomp%{libgomp_sover}%{libgomp_suffix}
Summary: The GNU compiler collection OpenMP runtime library
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: System/Base
Provides: libgomp%{libgomp_sover} = %{version}-%{release}
# Only one package may provide this - allows multiple gcc versions
@@ -637,7 +647,7 @@
%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-with-GCC-exception
+License: GPL-3.0 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
@@ -656,7 +666,7 @@
%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-with-GCC-exception
+License: GPL-3.0 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
@@ -676,7 +686,7 @@
%package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}
Summary: The standard C++ shared library
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: System/Libraries
Suggests: libstdc++%{libstdcxx_sover}-locale
Provides: libstdc++%{libstdcxx_sover} = %{version}-%{release}
@@ -693,7 +703,7 @@
%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-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: System/Libraries
Suggests: libstdc++%{libstdcxx_sover}-locale
Provides: libstdc++%{libstdcxx_sover}-32bit = %{version}-%{release}
@@ -710,7 +720,7 @@
%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-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: System/Libraries
Suggests: libstdc++%{libstdcxx_sover}-locale
Provides: libstdc++%{libstdcxx_sover}-64bit = %{version}-%{release}
@@ -728,7 +738,7 @@
%package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-locale
Summary: Standard C++ Library Locales
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 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
@@ -792,7 +802,7 @@
%package -n libobjc%{libobjc_sover}%{libobjc_suffix}
Summary: Library for the GNU Objective C Compiler
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 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
@@ -807,7 +817,7 @@
%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-with-GCC-exception
+License: GPL-3.0 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
@@ -822,7 +832,7 @@
%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-with-GCC-exception
+License: GPL-3.0 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
@@ -920,7 +930,7 @@
%package -n libada10
Summary: GNU Ada Runtime Libraries
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: System/Libraries
Provides: libgnarl-10 = %{version}-%{release}
Conflicts: %selfconflict libgnarl-10
@@ -940,7 +950,7 @@
%postun -n libada10 -p /sbin/ldconfig
%package -n libada10-32bit
Summary: GNU Ada Runtime Libraries
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: System/Libraries
Provides: libgnarl-10-32bit = %{version}-%{release}
Conflicts: %selfconflict libgnarl-10-32bit
@@ -960,7 +970,7 @@
%postun -n libada10-32bit -p /sbin/ldconfig
%package -n libada10-64bit
Summary: GNU Ada Runtime Libraries
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: System/Libraries
Provides: libgnarl-10-64bit = %{version}-%{release}
Conflicts: %selfconflict libgnarl-10-64bit
@@ -1021,7 +1031,7 @@
%package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}
Summary: The GNU Fortran Compiler Runtime Library
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: Development/Languages/Fortran
%ifarch %quadmath_arch
Requires: libquadmath%{libquadmath_sover} >= %{version}-%{release}
@@ -1040,7 +1050,7 @@
%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-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: Development/Languages/Fortran
%ifarch %quadmath_arch
Requires: libquadmath%{libquadmath_sover}-32bit >= %{version}-%{release}
@@ -1059,7 +1069,7 @@
%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-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: Development/Languages/Fortran
%ifarch %quadmath_arch
Requires: libquadmath%{libquadmath_sover}-64bit >= %{version}-%{release}
@@ -1278,7 +1288,7 @@
%package -n libatomic%{libatomic_sover}%{libatomic_suffix}
Summary: The GNU Compiler Atomic Operations Runtime Library
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 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
@@ -1293,7 +1303,7 @@
%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-with-GCC-exception
+License: GPL-3.0 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
@@ -1308,7 +1318,7 @@
%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-with-GCC-exception
+License: GPL-3.0 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
@@ -2354,6 +2364,9 @@
mv %{buildroot}/%{_lib}/libgcc_s.so %{buildroot}/%{versmainlibdir}/
fi
chmod a+x %{buildroot}/%{_lib}/libgcc_s.so.%{libgcc_s}
+%if 0%{?usrmerged}
+mv %{buildroot}/%{_lib}/libgcc_s.so.%{libgcc_s}
%{buildroot}/%{_slibdir}/libgcc_s.so.%{libgcc_s}
+%endif
%if %{biarch}
%if %{build_primary_64bit}
if test -L %{buildroot}/lib/libgcc_s.so; then
@@ -2364,6 +2377,9 @@
fi
ln -sf %{versmainlibdirbi32}/libgcc_s.so
%{buildroot}/%{versmainlibdirbi32}/libgcc_s_32.so
chmod a+x %{buildroot}/lib/libgcc_s.so.%{libgcc_s}
+%if 0%{?usrmerged}
+mv %{buildroot}/lib/libgcc_s.so.%{libgcc_s}
%{buildroot}/%{slibdir}/libgcc_s.so.%{libgcc_s}
+%endif
%else
# 32-bit biarch systems
if test -L %{buildroot}/lib64/libgcc_s.so; then
@@ -2374,6 +2390,9 @@
fi
ln -sf %{versmainlibdirbi64}/libgcc_s.so
%{buildroot}/%{versmainlibdirbi64}/libgcc_s_64.so
chmod a+x %{buildroot}/lib64/libgcc_s.so.%{libgcc_s}
+%if 0%{?usrmerged}
+mv %{buildroot}/lib64/libgcc_s.so.%{libgcc_s}
%{buildroot}/%{slibdir64}/libgcc_s.so.%{libgcc_s}
+%endif
%endif
%endif
@@ -2426,6 +2445,7 @@
rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/mathdef.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/ucontext.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/statx.h
+rm -f %{buildroot}/%{libsubdir}/include-fixed/pthread.h
%if !%{enable_plugins}
# no plugins
rm -rf %{buildroot}/%{libsubdir}/plugin
@@ -2899,15 +2919,15 @@
%files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}
%defattr(-,root,root)
-/%{_lib}/libgcc_s.so.%{libgcc_s}
+%{_slibdir}/libgcc_s.so.%{libgcc_s}
%if %{biarch}
%if %{build_primary_64bit}
%if !%{separate_bi32}
-/lib/libgcc_s.so.%{libgcc_s}
+%{slibdir}/libgcc_s.so.%{libgcc_s}
%endif
%else
%if !%{separate_bi64}
-/lib64/libgcc_s.so.%{libgcc_s}
+%{slibdir64}/libgcc_s.so.%{libgcc_s}
%endif
%endif
%endif
@@ -2915,13 +2935,13 @@
%if %{separate_bi64}
%files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-64bit
%defattr(-,root,root)
-/lib64/libgcc_s.so.%{libgcc_s}
+%{slibdir64}/libgcc_s.so.%{libgcc_s}
%endif
%if %{separate_bi32}
%files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-32bit
%defattr(-,root,root)
-/lib/libgcc_s.so.%{libgcc_s}
+%{slibdir}/libgcc_s.so.%{libgcc_s}
%endif
%files -n libgomp%{libgomp_sover}%{libgomp_suffix}
++++++ gcc.spec.in ++++++
--- /var/tmp/diff_new_pack.aZtYol/_old 2021-02-11 12:45:06.185289327 +0100
+++ /var/tmp/diff_new_pack.aZtYol/_new 2021-02-11 12:45:06.185289327 +0100
@@ -17,6 +17,15 @@
# nospeccleaner
+%if !0%{?usrmerged}
+%define _slibdir /%{_lib}
+%define slibdir /lib
+%define slibdir64 /lib64
+%else
+%define _slibdir %{_libdir}
+%define slibdir %{_prefix}/lib
+%define slibdir64 %{_libdir}
+%endif
# Ada currently fails to build on a few platforms, enable it only
# on those that work
@@ -452,7 +461,7 @@
# 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
+License: GPL-3.0 WITH GCC-exception-3.1
Group: Development/Languages/C and C++
Requires: libstdc++%{libstdcxx_sover}@variant@ >= %{version}-%{release}
Requires: glibc-devel@variant@
@@ -494,7 +503,7 @@
# PACKAGE-BEGIN
%package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}@variant@
Summary: C compiler runtime library
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 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
@@ -512,7 +521,7 @@
# 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
+License: GPL-3.0 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
@@ -534,7 +543,7 @@
# PACKAGE-BEGIN
%package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}@variant@
Summary: The standard C++ shared library
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: System/Libraries
Suggests: libstdc++%{libstdcxx_sover}-locale
Provides: libstdc++%{libstdcxx_sover}@variant@ = %{version}-%{release}
@@ -553,7 +562,7 @@
%package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-locale
Summary: Standard C++ Library Locales
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 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
@@ -596,7 +605,7 @@
# 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
+License: GPL-3.0 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
@@ -654,7 +663,7 @@
# PACKAGE-BEGIN
%package -n libada@base_ver@@variant@
Summary: GNU Ada Runtime Libraries
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: System/Libraries
Provides: libgnarl-@base_ver@@variant@ = %{version}-%{release}
Conflicts: %selfconflict libgnarl-@base_ver@@variant@
@@ -693,7 +702,7 @@
# PACKAGE-BEGIN
%package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}@variant@
Summary: The GNU Fortran Compiler Runtime Library
-License: GPL-3.0-with-GCC-exception
+License: GPL-3.0 WITH GCC-exception-3.1
Group: Development/Languages/Fortran
%ifarch %quadmath_arch
Requires: libquadmath%{libquadmath_sover}@variant@ >= %{version}-%{release}
@@ -792,7 +801,7 @@
# 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
+License: GPL-3.0 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
@@ -1635,6 +1644,9 @@
mv %{buildroot}/%{_lib}/libgcc_s.so %{buildroot}/%{versmainlibdir}/
fi
chmod a+x %{buildroot}/%{_lib}/libgcc_s.so.%{libgcc_s}
+%if 0%{?usrmerged}
+mv %{buildroot}/%{_lib}/libgcc_s.so.%{libgcc_s}
%{buildroot}/%{_slibdir}/libgcc_s.so.%{libgcc_s}
+%endif
%if %{biarch}
%if %{build_primary_64bit}
if test -L %{buildroot}/lib/libgcc_s.so; then
@@ -1645,6 +1657,9 @@
fi
ln -sf %{versmainlibdirbi32}/libgcc_s.so
%{buildroot}/%{versmainlibdirbi32}/libgcc_s_32.so
chmod a+x %{buildroot}/lib/libgcc_s.so.%{libgcc_s}
+%if 0%{?usrmerged}
+mv %{buildroot}/lib/libgcc_s.so.%{libgcc_s}
%{buildroot}/%{slibdir}/libgcc_s.so.%{libgcc_s}
+%endif
%else
# 32-bit biarch systems
if test -L %{buildroot}/lib64/libgcc_s.so; then
@@ -1655,6 +1670,9 @@
fi
ln -sf %{versmainlibdirbi64}/libgcc_s.so
%{buildroot}/%{versmainlibdirbi64}/libgcc_s_64.so
chmod a+x %{buildroot}/lib64/libgcc_s.so.%{libgcc_s}
+%if 0%{?usrmerged}
+mv %{buildroot}/lib64/libgcc_s.so.%{libgcc_s}
%{buildroot}/%{slibdir64}/libgcc_s.so.%{libgcc_s}
+%endif
%endif
%endif
@@ -1709,6 +1727,7 @@
rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/mathdef.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/ucontext.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/statx.h
+rm -f %{buildroot}/%{libsubdir}/include-fixed/pthread.h
%if !%{enable_plugins}
# no plugins
rm -rf %{buildroot}/%{libsubdir}/plugin
@@ -2184,15 +2203,15 @@
%files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}
%defattr(-,root,root)
-/%{_lib}/libgcc_s.so.%{libgcc_s}
+%{_slibdir}/libgcc_s.so.%{libgcc_s}
%if %{biarch}
%if %{build_primary_64bit}
%if !%{separate_bi32}
-/lib/libgcc_s.so.%{libgcc_s}
+%{slibdir}/libgcc_s.so.%{libgcc_s}
%endif
%else
%if !%{separate_bi64}
-/lib64/libgcc_s.so.%{libgcc_s}
+%{slibdir64}/libgcc_s.so.%{libgcc_s}
%endif
%endif
%endif
@@ -2200,13 +2219,13 @@
%if %{separate_bi64}
%files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-64bit
%defattr(-,root,root)
-/lib64/libgcc_s.so.%{libgcc_s}
+%{slibdir64}/libgcc_s.so.%{libgcc_s}
%endif
%if %{separate_bi32}
%files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-32bit
%defattr(-,root,root)
-/lib/libgcc_s.so.%{libgcc_s}
+%{slibdir}/libgcc_s.so.%{libgcc_s}
%endif
