diff --git a/gcc.spec.in b/gcc.spec.in
index 1081ec7..24d0300 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -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.changes b/gcc12.changes
index 082772a..6b13531 100644
--- a/gcc12.changes
+++ b/gcc12.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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..a5a771b 100644
--- a/gcc12.spec
+++ b/gcc12.spec
@@ -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