diff --git a/cross-aarch64-gcc12-bootstrap.spec b/cross-aarch64-gcc12-bootstrap.spec
index 58562e5..145b047 100644
--- a/cross-aarch64-gcc12-bootstrap.spec
+++ b/cross-aarch64-gcc12-bootstrap.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-aarch64-gcc12.spec b/cross-aarch64-gcc12.spec
index 98619f5..7974c52 100644
--- a/cross-aarch64-gcc12.spec
+++ b/cross-aarch64-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-amdgcn-gcc12.spec b/cross-amdgcn-gcc12.spec
index c5592c0..434c9f3 100644
--- a/cross-amdgcn-gcc12.spec
+++ b/cross-amdgcn-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-arm-gcc12.spec b/cross-arm-gcc12.spec
index 7a6e590..53884c4 100644
--- a/cross-arm-gcc12.spec
+++ b/cross-arm-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-arm-none-gcc12-bootstrap.spec b/cross-arm-none-gcc12-bootstrap.spec
index 21b4d5b..60f6573 100644
--- a/cross-arm-none-gcc12-bootstrap.spec
+++ b/cross-arm-none-gcc12-bootstrap.spec
@@ -102,7 +102,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-arm-none-gcc12.spec b/cross-arm-none-gcc12.spec
index 21c375b..49b9faf 100644
--- a/cross-arm-none-gcc12.spec
+++ b/cross-arm-none-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-avr-gcc12-bootstrap.spec b/cross-avr-gcc12-bootstrap.spec
index c0447f0..6a6d566 100644
--- a/cross-avr-gcc12-bootstrap.spec
+++ b/cross-avr-gcc12-bootstrap.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-avr-gcc12.spec b/cross-avr-gcc12.spec
index 7facc8e..f66f238 100644
--- a/cross-avr-gcc12.spec
+++ b/cross-avr-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-epiphany-gcc12-bootstrap.spec b/cross-epiphany-gcc12-bootstrap.spec
index 736f889..5acc275 100644
--- a/cross-epiphany-gcc12-bootstrap.spec
+++ b/cross-epiphany-gcc12-bootstrap.spec
@@ -102,7 +102,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-epiphany-gcc12.spec b/cross-epiphany-gcc12.spec
index 4261e43..95c772e 100644
--- a/cross-epiphany-gcc12.spec
+++ b/cross-epiphany-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-hppa-gcc12-bootstrap.spec b/cross-hppa-gcc12-bootstrap.spec
index 1b1f9e2..dde2eef 100644
--- a/cross-hppa-gcc12-bootstrap.spec
+++ b/cross-hppa-gcc12-bootstrap.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-hppa-gcc12.spec b/cross-hppa-gcc12.spec
index 0e9e764..7e0fde8 100644
--- a/cross-hppa-gcc12.spec
+++ b/cross-hppa-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-m68k-gcc12.spec b/cross-m68k-gcc12.spec
index 0aaf6b1..e477b03 100644
--- a/cross-m68k-gcc12.spec
+++ b/cross-m68k-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-mips-gcc12.spec b/cross-mips-gcc12.spec
index 85402ee..cce819a 100644
--- a/cross-mips-gcc12.spec
+++ b/cross-mips-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-nvptx-gcc12.spec b/cross-nvptx-gcc12.spec
index 7852926..2acb7e6 100644
--- a/cross-nvptx-gcc12.spec
+++ b/cross-nvptx-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-ppc64-gcc12.spec b/cross-ppc64-gcc12.spec
index 65a0244..29439e4 100644
--- a/cross-ppc64-gcc12.spec
+++ b/cross-ppc64-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-ppc64le-gcc12.spec b/cross-ppc64le-gcc12.spec
index cde7782..6dc45ff 100644
--- a/cross-ppc64le-gcc12.spec
+++ b/cross-ppc64le-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-pru-gcc12-bootstrap.spec b/cross-pru-gcc12-bootstrap.spec
index 0b14f51..531ef16 100644
--- a/cross-pru-gcc12-bootstrap.spec
+++ b/cross-pru-gcc12-bootstrap.spec
@@ -102,7 +102,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-pru-gcc12.spec b/cross-pru-gcc12.spec
index 3f5ec33..cb76763 100644
--- a/cross-pru-gcc12.spec
+++ b/cross-pru-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-riscv64-elf-gcc12-bootstrap.spec b/cross-riscv64-elf-gcc12-bootstrap.spec
index 01c21f6..66e9fa9 100644
--- a/cross-riscv64-elf-gcc12-bootstrap.spec
+++ b/cross-riscv64-elf-gcc12-bootstrap.spec
@@ -102,7 +102,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-riscv64-elf-gcc12.spec b/cross-riscv64-elf-gcc12.spec
index f5c9b49..c146698 100644
--- a/cross-riscv64-elf-gcc12.spec
+++ b/cross-riscv64-elf-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-riscv64-gcc12-bootstrap.spec b/cross-riscv64-gcc12-bootstrap.spec
index edd82bb..75b4626 100644
--- a/cross-riscv64-gcc12-bootstrap.spec
+++ b/cross-riscv64-gcc12-bootstrap.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-riscv64-gcc12.spec b/cross-riscv64-gcc12.spec
index 7d063c4..72d1629 100644
--- a/cross-riscv64-gcc12.spec
+++ b/cross-riscv64-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-rx-gcc12-bootstrap.spec b/cross-rx-gcc12-bootstrap.spec
index 49dd4c2..4a5a089 100644
--- a/cross-rx-gcc12-bootstrap.spec
+++ b/cross-rx-gcc12-bootstrap.spec
@@ -102,7 +102,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-rx-gcc12.spec b/cross-rx-gcc12.spec
index 8984029..b8f2a38 100644
--- a/cross-rx-gcc12.spec
+++ b/cross-rx-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-s390x-gcc12.spec b/cross-s390x-gcc12.spec
index c72b5eb..944e0d0 100644
--- a/cross-s390x-gcc12.spec
+++ b/cross-s390x-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-sparc-gcc12.spec b/cross-sparc-gcc12.spec
index f85a3d9..827b2aa 100644
--- a/cross-sparc-gcc12.spec
+++ b/cross-sparc-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-sparc64-gcc12.spec b/cross-sparc64-gcc12.spec
index 83f71ad..4fd123c 100644
--- a/cross-sparc64-gcc12.spec
+++ b/cross-sparc64-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/cross-x86_64-gcc12.spec b/cross-x86_64-gcc12.spec
index 0f93c04..81b5e99 100644
--- a/cross-x86_64-gcc12.spec
+++ b/cross-x86_64-gcc12.spec
@@ -101,7 +101,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/gcc-12.1.1+git287.tar.xz b/gcc-12.1.1+git287.tar.xz
deleted file mode 100644
index a6b5e15..0000000
--- a/gcc-12.1.1+git287.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15ab3c01aacd92decf1f27ce230b9880aaceba0178398fe845fc395dfdac66a5
-size 82957120
diff --git a/gcc-12.1.1+git372.tar.xz b/gcc-12.1.1+git372.tar.xz
new file mode 100644
index 0000000..afb029c
--- /dev/null
+++ b/gcc-12.1.1+git372.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b476c9e4765697429e699772ac2ccd8fe14061b3c0140babdfe5ec4285402d7b
+size 83016352
diff --git a/gcc.spec.in b/gcc.spec.in
index 1081ec7..e2c9521 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -190,7 +190,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:          https://gcc.gnu.org/
-Version: 12.1.1+git287
+Version: 12.1.1+git372
 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/+/-/')
@@ -723,11 +723,9 @@ Summary:      GNU Ada Runtime Libraries
 License:      GPL-3.0-or-later WITH GCC-exception-3.1
 Group:        System/Libraries
 Provides: libgnarl-@base_ver@@variant@ = %{version}-%{release}
-# FIXME: remove %{after} service-format_spec_file is fixed
-# https://github.com/openSUSE/obs-service-format_spec_file/issues/46
-Conflicts:	%selfconflict libgnarl-@base_ver@@variant@%{nil}
+Conflicts:	%selfconflict libgnarl-@base_ver@@variant@
 Provides: libgnat-@base_ver@@variant@ = %{version}-%{release}
-Conflicts:	%selfconflict libgnat-@base_ver@@variant@%{nil}
+Conflicts:	%selfconflict libgnat-@base_ver@@variant@
 
 %description -n libada@base_ver@@variant@
 This package contains the shared libraries required to run programs
diff --git a/gcc12-testresults.spec b/gcc12-testresults.spec
index d588c48..bcbe6ce 100644
--- a/gcc12-testresults.spec
+++ b/gcc12-testresults.spec
@@ -207,7 +207,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
diff --git a/gcc12.changes b/gcc12.changes
index 082772a..023fda5 100644
--- a/gcc12.changes
+++ b/gcc12.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Aug 12 11:06:04 UTC 2022 - Richard Biener <rguenther@suse.com>
+
+- Update to gcc-12 branch head, 6b7d570a5001bb79e34c0d1626a, git372
+  * includes release candidate for GCC 12.2
+
+-------------------------------------------------------------------
+Mon Aug  8 18:31:18 UTC 2022 - Martin Liška <mliska@suse.cz>
+
+- Remove workaround for obs-service-format_spec_file.
+
 -------------------------------------------------------------------
 Tue Jul 26 06:46:45 UTC 2022 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc12.spec b/gcc12.spec
index 4439779..4d0c4d6 100644
--- a/gcc12.spec
+++ b/gcc12.spec
@@ -186,7 +186,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        12.1.1+git287
+Version:        12.1.1+git372
 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/+/-/')
@@ -1016,11 +1016,9 @@ Summary:        GNU Ada Runtime Libraries
 License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Provides:       libgnarl-12 = %{version}-%{release}
-# FIXME: remove %{after} service-format_spec_file is fixed
-# https://github.com/openSUSE/obs-service-format_spec_file/issues/46
-Conflicts:      %selfconflict libgnarl-12%{nil}
+Conflicts:      %selfconflict libgnarl-12
 Provides:       libgnat-12 = %{version}-%{release}
-Conflicts:      %selfconflict libgnat-12%{nil}
+Conflicts:      %selfconflict libgnat-12
 
 %description -n libada12
 This package contains the shared libraries required to run programs
@@ -1039,11 +1037,9 @@ Summary:        GNU Ada Runtime Libraries
 License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Provides:       libgnarl-12-32bit = %{version}-%{release}
-# FIXME: remove %{after} service-format_spec_file is fixed
-# https://github.com/openSUSE/obs-service-format_spec_file/issues/46
-Conflicts:      %selfconflict libgnarl-12-32bit%{nil}
+Conflicts:      %selfconflict libgnarl-12-32bit
 Provides:       libgnat-12-32bit = %{version}-%{release}
-Conflicts:      %selfconflict libgnat-12-32bit%{nil}
+Conflicts:      %selfconflict libgnat-12-32bit
 
 %description -n libada12-32bit
 This package contains the shared libraries required to run programs
@@ -1062,11 +1058,9 @@ Summary:        GNU Ada Runtime Libraries
 License:        GPL-3.0-or-later WITH GCC-exception-3.1
 Group:          System/Libraries
 Provides:       libgnarl-12-64bit = %{version}-%{release}
-# FIXME: remove %{after} service-format_spec_file is fixed
-# https://github.com/openSUSE/obs-service-format_spec_file/issues/46
-Conflicts:      %selfconflict libgnarl-12-64bit%{nil}
+Conflicts:      %selfconflict libgnarl-12-64bit
 Provides:       libgnat-12-64bit = %{version}-%{release}
-Conflicts:      %selfconflict libgnat-12-64bit%{nil}
+Conflicts:      %selfconflict libgnat-12-64bit
 
 %description -n libada12-64bit
 This package contains the shared libraries required to run programs