Accepting request 1085727 from devel:gcc

- Backport _multibuild auto-generation. Remove redundant .changes files. - Add _multibuild to define 2nd spec file as additional flavor. Eliminates the need for source package links in OBS. OBS-URL: https://build.opensuse.org/request/show/1085727 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcc11?expand=0&rev=20
- Backport _multibuild auto-generation. Remove redundant
2023-05-10 14:17:42 +00:00 · 2023-05-09 13:27:51 +00:00 · 2023-05-09 13:23:08 +00:00 · 2023-01-09 16:23:50 +00:00 · 2023-01-09 08:25:59 +00:00 · 2022-10-25 09:19:31 +00:00
34 changed files with 576 additions and 814 deletions
--- a/cross-aarch64-gcc11-bootstrap.spec
+++ b/cross-aarch64-gcc11-bootstrap.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-aarch64-gcc11-bootstrap
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-aarch64-gcc11.spec
+++ b/cross-aarch64-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-aarch64-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-amdgcn-gcc11.spec
+++ b/cross-amdgcn-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-amdgcn-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-arm-gcc11.spec
+++ b/cross-arm-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-arm-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-arm-none-gcc11-bootstrap.spec
+++ b/cross-arm-none-gcc11-bootstrap.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-arm-none-gcc11-bootstrap
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -110,7 +110,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -136,8 +136,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -285,7 +283,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -305,7 +303,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -313,27 +311,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-arm-none-gcc11.spec
+++ b/cross-arm-none-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-arm-none-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-avr-gcc11-bootstrap.spec
+++ b/cross-avr-gcc11-bootstrap.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-avr-gcc11-bootstrap
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-avr-gcc11.spec
+++ b/cross-avr-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-avr-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-epiphany-gcc11-bootstrap.spec
+++ b/cross-epiphany-gcc11-bootstrap.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-epiphany-gcc11-bootstrap
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -110,7 +110,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -136,8 +136,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -285,7 +283,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -305,7 +303,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -313,27 +311,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-epiphany-gcc11.spec
+++ b/cross-epiphany-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-epiphany-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-hppa-gcc11.spec
+++ b/cross-hppa-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-hppa-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-m68k-gcc11.spec
+++ b/cross-m68k-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-m68k-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-mips-gcc11.spec
+++ b/cross-mips-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-mips-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-nvptx-gcc11.spec
+++ b/cross-nvptx-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-nvptx-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-ppc64-gcc11.spec
+++ b/cross-ppc64-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-ppc64-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-ppc64le-gcc11.spec
+++ b/cross-ppc64le-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-ppc64le-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-riscv64-elf-gcc11-bootstrap.spec
+++ b/cross-riscv64-elf-gcc11-bootstrap.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-riscv64-elf-gcc11-bootstrap
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -110,7 +110,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -136,8 +136,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -285,7 +283,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -305,7 +303,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -313,27 +311,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-riscv64-elf-gcc11.spec
+++ b/cross-riscv64-elf-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-riscv64-elf-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-riscv64-gcc11-bootstrap.spec
+++ b/cross-riscv64-gcc11-bootstrap.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-riscv64-gcc11-bootstrap
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-riscv64-gcc11.spec
+++ b/cross-riscv64-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-riscv64-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-rx-gcc11-bootstrap.spec
+++ b/cross-rx-gcc11-bootstrap.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-rx-gcc11-bootstrap
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -110,7 +110,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -136,8 +136,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -285,7 +283,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -305,7 +303,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -313,27 +311,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-rx-gcc11.spec
+++ b/cross-rx-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-rx-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-s390x-gcc11.spec
+++ b/cross-s390x-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-s390x-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-sparc-gcc11.spec
+++ b/cross-sparc-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-sparc-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-sparc64-gcc11.spec
+++ b/cross-sparc64-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-sparc64-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/cross-x86_64-gcc11.spec
+++ b/cross-x86_64-gcc11.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cross-x86_64-gcc11
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,7 +109,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -135,8 +135,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -284,7 +282,7 @@ Requires:       libstdc++6-devel-gcc11
 AutoReqProv:    off
 BuildRequires:  update-alternatives
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Summary:        The GNU Compiler Collection targeting %{cross_arch}
 License:        GPL-3.0-or-later
@@ -304,7 +302,7 @@ only, it is not intended for any other use.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -312,27 +310,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/gcc-11.3.1+git2076.tar.xz
+++ b/gcc-11.3.1+git2076.tar.xz
@@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:ba74eab4810174cd305f71b82cb4d82e6dba65b264bbb283885525a52ecb1d32
 size 79766128
--- a/gcc-11.5.0+git3328.tar.xz
+++ b/gcc-11.5.0+git3328.tar.xz
@@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:f13503fb4ccd340fe9faeb9b9c56853cc37dba787f375bdf948e0c30bed63339
 size 79368292
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -191,7 +191,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:          https://gcc.gnu.org/
-Version: 11.5.0+git3328
+Version: 11.3.1+git2076
 Release:      1
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -365,8 +365,6 @@ Patch17:	gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:	gcc10-amdgcn-llvm-as.patch
 Patch19:	gcc11-gdwarf-4-default.patch
 Patch20:	gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:	gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:	gcc41-ppc32-retaddr.patch
 Patch52:	gcc10-foffload-default.patch
@@ -1181,7 +1179,7 @@ Results from running the gcc and target library testsuites.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -1189,27 +1187,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
@@ -1876,7 +1873,6 @@ rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/statx.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/pthread.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/rseq.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/mount.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/sched.h
 %if !%{enable_plugins}
 # no plugins
 rm -rf %{buildroot}/%{libsubdir}/plugin
--- a/gcc11-pr116029.patch
+++ b/gcc11-pr116029.patch
@@ -1,115 +0,0 @@
 From 5522dec054cb940fe83661b96249aa12c54c1d77 Mon Sep 17 00:00:00 2001
 From: Andre Vieira <andre.simoesdiasvieira@arm.com>
 Date: Fri, 8 Apr 2022 15:12:23 +0100
 Subject: [PATCH] aarch64: PR target/105157 Increase number of cores
 TARGET_CPU_DEFAULT can encode
 To: gcc-patches@gcc.gnu.org
 This addresses the compile-time increase seen in the PR target/105157. This was
 being caused by selecting the wrong core tuning, as when we added the latest
 AArch64 the TARGET_CPU_generic tuning was pushed beyond the 0x3f mask we used
 to encode both target cpu and attributes into TARGET_CPU_DEFAULT.
 gcc/ChangeLog:
 	PR target/105157
 	* config.gcc: Shift ext_mask by TARGET_CPU_NBITS.
 	* config/aarch64/aarch64.h (TARGET_CPU_NBITS): New macro.
 	(TARGET_CPU_MASK): Likewise.
 	(TARGET_CPU_DEFAULT): Use TARGET_CPU_NBITS.
 	* config/aarch64/aarch64.c (aarch64_get_tune_cpu): Use TARGET_CPU_MASK.
 	(aarch64_get_arch): Likewise.
 	(aarch64_override_options): Use TARGET_CPU_NBITS.
 ---
 gcc/config.gcc                |  2 +-
 gcc/config/aarch64/aarch64.c | 14 +++++++++-----
 gcc/config/aarch64/aarch64.h  |  8 +++++++-
 3 files changed, 17 insertions(+), 7 deletions(-)
 diff --git a/gcc/config.gcc b/gcc/config.gcc
 index 7b58e1314ff..5382788e267 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
@@ -4261,7 +4261,7 @@ case "${target}" in
 				ext_val=`echo $ext_val | sed -e 's/[a-z0-9]\+//'`
 			  done
 -			  ext_mask="(("$ext_mask") << 6)"
 +			  ext_mask="(("$ext_mask") << TARGET_CPU_NBITS)"
 			  if [ x"$base_id" != x ]; then
 				target_cpu_cname="TARGET_CPU_$base_id | $ext_mask"
 			  fi
 diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
 index 3e2a6fb6472..cf62bdd023b 100644
 --- a/gcc/config/aarch64/aarch64.c
 +++ b/gcc/config/aarch64/aarch64.c
@@ -18053,6 +18053,9 @@ aarch64_validate_mtune (const char *str, const struct processor **res)
   return false;
 }
 +static_assert (TARGET_CPU_generic < TARGET_CPU_MASK,
 +	       "TARGET_CPU_NBITS is big enough");
 +
 /* Return the CPU corresponding to the enum CPU.
    If it doesn't specify a cpu, return the default.  */
@@ -18062,12 +18065,12 @@ aarch64_get_tune_cpu (enum aarch64_processor cpu)
   if (cpu != aarch64_none)
     return &all_cores[cpu];
 -  /* The & 0x3f is to extract the bottom 6 bits that encode the
 -     default cpu as selected by the --with-cpu GCC configure option
 +  /* The & TARGET_CPU_MASK is to extract the bottom TARGET_CPU_NBITS bits that
 +     encode the default cpu as selected by the --with-cpu GCC configure option
      in config.gcc.
      ???: The whole TARGET_CPU_DEFAULT and AARCH64_CPU_DEFAULT_FLAGS
      flags mechanism should be reworked to make it more sane.  */
 -  return &all_cores[TARGET_CPU_DEFAULT & 0x3f];
 +  return &all_cores[TARGET_CPU_DEFAULT & TARGET_CPU_MASK];
 }
 /* Return the architecture corresponding to the enum ARCH.
@@ -18079,7 +18082,8 @@ aarch64_get_arch (enum aarch64_arch arch)
   if (arch != aarch64_no_arch)
     return &all_architectures[arch];
 -  const struct processor *cpu = &all_cores[TARGET_CPU_DEFAULT & 0x3f];
 +  const struct processor *cpu
 +    = &all_cores[TARGET_CPU_DEFAULT & TARGET_CPU_MASK];
   return &all_architectures[cpu->arch];
 }
@@ -18166,7 +18170,7 @@ aarch64_override_options (void)
 	{
 	  /* Get default configure-time CPU.  */
 	  selected_cpu = aarch64_get_tune_cpu (aarch64_none);
 -	  aarch64_isa_flags = TARGET_CPU_DEFAULT >> 6;
 +	  aarch64_isa_flags = TARGET_CPU_DEFAULT >> TARGET_CPU_NBITS;
 	}
       if (selected_tune)
 diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
 index efa46ac0b87..359b6e8561f 100644
 --- a/gcc/config/aarch64/aarch64.h
 +++ b/gcc/config/aarch64/aarch64.h
@@ -813,10 +813,16 @@ enum target_cpus
   TARGET_CPU_generic
 };
 +/* Define how many bits are used to represent the CPU in TARGET_CPU_DEFAULT.
 +   This needs to be big enough to fit the value of TARGET_CPU_generic.
 +   All bits after this are used to represent the AARCH64_CPU_DEFAULT_FLAGS.  */
 +#define TARGET_CPU_NBITS 8
 +#define TARGET_CPU_MASK ((1 << TARGET_CPU_NBITS) - 1)
 +
 /* If there is no CPU defined at configure, use generic as default.  */
 #ifndef TARGET_CPU_DEFAULT
 #define TARGET_CPU_DEFAULT \
 -  (TARGET_CPU_generic | (AARCH64_CPU_DEFAULT_FLAGS << 6))
 +  (TARGET_CPU_generic | (AARCH64_CPU_DEFAULT_FLAGS << TARGET_CPU_NBITS))
 #endif
 /* If inserting NOP before a mult-accumulate insn remember to adjust the
 -- 
 2.35.3
--- a/gcc11-testresults.spec
+++ b/gcc11-testresults.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gcc11-testresults
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -208,7 +208,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -381,8 +381,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -497,7 +495,7 @@ Results from running the gcc and target library testsuites.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -505,27 +503,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
--- a/gcc11.changes
+++ b/gcc11.changes
@@ -1,37 +1,3 @@
 -------------------------------------------------------------------
 Wed Jul 30 11:34:42 UTC 2025 - Richard Biener <rguenther@suse.com>
 - Remove include-fixed/bits/sched.h 
 -------------------------------------------------------------------
 Tue Jul 23 06:53:38 UTC 2024 - Richard Biener <rguenther@suse.com>
 - Add gcc11-pr116029.patch to fix architecture flags overflow
  on aarch64.
 -------------------------------------------------------------------
 Fri Jul 19 06:34:12 UTC 2024 - Richard Biener <rguenther@suse.com>
 - Update to GCC 11.5 release (5cc4c42a0d4de08715c2eef8715), git3328
 -------------------------------------------------------------------
 Fri Jul 12 12:59:56 UTC 2024 - Richard Biener <rguenther@suse.com>
 - Update to gcc-11 branch head (30ffca55041518b76cfd59877), git3317
  * includes GCC 11.5 RC1
 -------------------------------------------------------------------
 Fri Jun 30 08:00:24 UTC 2023 - Richard Biener <rguenther@suse.com>
 - Update to gcc-11 branch head (f03b182f7f23e14d587cfa1da), git2630
  * includes GCC 11.4 release
 -------------------------------------------------------------------
 Mon May 22 12:23:38 UTC 2023 - Richard Biener <rguenther@suse.com>
 - Update to gcc-11 branch head (fcf62b96ec9ae32d56530ba86), git2550 
  * includes GCC 11.4 RC1
 -------------------------------------------------------------------
 Tue May  9 13:24:23 UTC 2023 - Richard Biener <rguenther@suse.com>
--- a/gcc11.spec
+++ b/gcc11.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gcc11
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -187,7 +187,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 URL:            https://gcc.gnu.org/
-Version:        11.5.0+git3328
+Version:        11.3.1+git2076
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -360,8 +360,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
 # r12-8060-g5522dec054cb940fe83661b96249aa12c54c1d77
 Patch21:        gcc11-pr116029.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 Patch52:        gcc10-foffload-default.patch
@@ -1982,7 +1980,7 @@ Results from running the gcc and target library testsuites.
 %setup -q -n gcc-%{version} -a 5
 ln -s newlib-4.1.0/newlib .
 cd newlib
-%patch -P 100 -p1
+%patch100 -p1
 cd ..
 %else
 %setup -q -n gcc-%{version}
@@ -1990,27 +1988,26 @@ cd ..
 #test patching start
-%patch -P 2
+%patch2
-%patch -P 5
+%patch5
-%patch -P 6
+%patch6
-%patch -P 7
+%patch7
-%patch -P 11
+%patch11
-%patch -P 15
+%patch15
-%patch -P 16
+%patch16
-%patch -P 17 -p1
+%patch17 -p1
 %if "%{TARGET_ARCH}" == "amdgcn"
-%patch -P 18 -p1
+%patch18 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch -P 19 -p1
+%patch19 -p1
 %endif
-%patch -P 20 -p1
+%patch20 -p1
-%patch -P 21 -p1
+%patch51
-%patch -P 51
+%patch52 -p1
-%patch -P 52 -p1
+%patch60 -p1
-%patch -P 60 -p1
+%patch61
 %patch -P 61
 #test patching end
@@ -2671,7 +2668,6 @@ rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/statx.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/pthread.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/rseq.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/mount.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/sched.h
 %if !%{enable_plugins}
 # no plugins
 rm -rf %{buildroot}/%{libsubdir}/plugin
--- a/pre_checkin.sh
+++ b/pre_checkin.sh