diff --git a/gcc.spec.in b/gcc.spec.in index 866f9be..4d74df1 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -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 @@ -465,7 +474,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 +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@ @@ -507,7 +516,7 @@ from GDB. # 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 @@ -525,7 +534,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 +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 @@ -547,7 +556,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 +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Suggests: libstdc++%{libstdcxx_sover}-locale Provides: libstdc++%{libstdcxx_sover}@variant@ = %{version}-%{release} @@ -566,7 +575,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 +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 @@ -609,7 +618,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 +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 @@ -667,7 +676,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 +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@ @@ -706,7 +715,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 +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/Fortran %ifarch %quadmath_arch Requires: libquadmath%{libquadmath_sover}@variant@ >= %{version}-%{release} @@ -825,7 +834,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 +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 @@ -1696,6 +1705,9 @@ else 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 @@ -1706,6 +1718,9 @@ else 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 @@ -1716,6 +1731,9 @@ else 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 @@ -2259,15 +2277,15 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang %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 @@ -2275,13 +2293,13 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang %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 diff --git a/gcc11-testresults.spec b/gcc11-testresults.spec index 367e5da..9d78f97 100644 --- a/gcc11-testresults.spec +++ b/gcc11-testresults.spec @@ -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 diff --git a/gcc11.spec b/gcc11.spec index d9280dd..caa1748 100644 --- a/gcc11.spec +++ b/gcc11.spec @@ -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 @@ -477,7 +487,7 @@ 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-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} @@ -494,7 +504,7 @@ 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-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} @@ -511,7 +521,7 @@ 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-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} @@ -585,7 +595,7 @@ from GDB. %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 @@ -600,7 +610,7 @@ Libgcc is needed for dynamically linked C programs. %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 @@ -615,7 +625,7 @@ Libgcc is needed for dynamically linked C programs. %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 @@ -631,7 +641,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-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 @@ -650,7 +660,7 @@ option. %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 @@ -669,7 +679,7 @@ option. %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 @@ -689,7 +699,7 @@ option. %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} @@ -706,7 +716,7 @@ The standard C++ library, needed for dynamically linked C++ programs. %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} @@ -723,7 +733,7 @@ The standard C++ library, needed for dynamically linked C++ programs. %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} @@ -741,7 +751,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 +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 @@ -805,7 +815,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-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 @@ -820,7 +830,7 @@ The library for the GNU Objective C compiler. %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 @@ -835,7 +845,7 @@ The library for the GNU Objective C compiler. %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 @@ -933,7 +943,7 @@ tools based on the GNU GCC technology. %package -n libada11 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-11 = %{version}-%{release} Conflicts: %selfconflict libgnarl-11 @@ -953,7 +963,7 @@ implementation of Distributed Systems Programming (GLADE) and the Posix %postun -n libada11 -p /sbin/ldconfig %package -n libada11-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-11-32bit = %{version}-%{release} Conflicts: %selfconflict libgnarl-11-32bit @@ -973,7 +983,7 @@ implementation of Distributed Systems Programming (GLADE) and the Posix %postun -n libada11-32bit -p /sbin/ldconfig %package -n libada11-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-11-64bit = %{version}-%{release} Conflicts: %selfconflict libgnarl-11-64bit @@ -1034,7 +1044,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-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} @@ -1053,7 +1063,7 @@ of the GNU Compiler Collection (GCC). %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} @@ -1072,7 +1082,7 @@ of the GNU Compiler Collection (GCC). %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} @@ -1340,7 +1350,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-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 @@ -1355,7 +1365,7 @@ The runtime library for atomic operations of the GNU Compiler Collection (GCC). %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 @@ -1370,7 +1380,7 @@ The runtime library for atomic operations of the GNU Compiler Collection (GCC). %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 @@ -2446,6 +2456,9 @@ else 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 @@ -2456,6 +2469,9 @@ else 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 @@ -2466,6 +2482,9 @@ else 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 @@ -2518,6 +2537,7 @@ rm -f %{buildroot}/%{libsubdir}/include-fixed/asm-generic/socket.h 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 @@ -3004,15 +3024,15 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc11-locale.lang %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 @@ -3020,13 +3040,13 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc11-locale.lang %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}