Accepting request 993838 from home:marxin:branches:devel:gcc

- Remove workaround for obs-service-format_spec_file.

OBS-URL: https://build.opensuse.org/request/show/993838
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc12?expand=0&rev=57
This commit is contained in:
Richard Biener 2022-08-09 07:26:19 +00:00 committed by Git OBS Bridge
parent c7d5f11e48
commit 58c3611dca
3 changed files with 13 additions and 16 deletions

View File

@ -723,11 +723,9 @@ Summary: GNU Ada Runtime Libraries
License: GPL-3.0-or-later WITH GCC-exception-3.1 License: GPL-3.0-or-later WITH GCC-exception-3.1
Group: System/Libraries Group: System/Libraries
Provides: libgnarl-@base_ver@@variant@ = %{version}-%{release} Provides: libgnarl-@base_ver@@variant@ = %{version}-%{release}
# FIXME: remove %{after} service-format_spec_file is fixed Conflicts: %selfconflict libgnarl-@base_ver@@variant@
# https://github.com/openSUSE/obs-service-format_spec_file/issues/46
Conflicts: %selfconflict libgnarl-@base_ver@@variant@%{nil}
Provides: libgnat-@base_ver@@variant@ = %{version}-%{release} 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@ %description -n libada@base_ver@@variant@
This package contains the shared libraries required to run programs This package contains the shared libraries required to run programs

View File

@ -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> Tue Jul 26 06:46:45 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1016,11 +1016,9 @@ Summary: GNU Ada Runtime Libraries
License: GPL-3.0-or-later WITH GCC-exception-3.1 License: GPL-3.0-or-later WITH GCC-exception-3.1
Group: System/Libraries Group: System/Libraries
Provides: libgnarl-12 = %{version}-%{release} Provides: libgnarl-12 = %{version}-%{release}
# FIXME: remove %{after} service-format_spec_file is fixed Conflicts: %selfconflict libgnarl-12
# https://github.com/openSUSE/obs-service-format_spec_file/issues/46
Conflicts: %selfconflict libgnarl-12%{nil}
Provides: libgnat-12 = %{version}-%{release} Provides: libgnat-12 = %{version}-%{release}
Conflicts: %selfconflict libgnat-12%{nil} Conflicts: %selfconflict libgnat-12
%description -n libada12 %description -n libada12
This package contains the shared libraries required to run programs 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 License: GPL-3.0-or-later WITH GCC-exception-3.1
Group: System/Libraries Group: System/Libraries
Provides: libgnarl-12-32bit = %{version}-%{release} Provides: libgnarl-12-32bit = %{version}-%{release}
# FIXME: remove %{after} service-format_spec_file is fixed Conflicts: %selfconflict libgnarl-12-32bit
# https://github.com/openSUSE/obs-service-format_spec_file/issues/46
Conflicts: %selfconflict libgnarl-12-32bit%{nil}
Provides: libgnat-12-32bit = %{version}-%{release} Provides: libgnat-12-32bit = %{version}-%{release}
Conflicts: %selfconflict libgnat-12-32bit%{nil} Conflicts: %selfconflict libgnat-12-32bit
%description -n libada12-32bit %description -n libada12-32bit
This package contains the shared libraries required to run programs 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 License: GPL-3.0-or-later WITH GCC-exception-3.1
Group: System/Libraries Group: System/Libraries
Provides: libgnarl-12-64bit = %{version}-%{release} Provides: libgnarl-12-64bit = %{version}-%{release}
# FIXME: remove %{after} service-format_spec_file is fixed Conflicts: %selfconflict libgnarl-12-64bit
# https://github.com/openSUSE/obs-service-format_spec_file/issues/46
Conflicts: %selfconflict libgnarl-12-64bit%{nil}
Provides: libgnat-12-64bit = %{version}-%{release} Provides: libgnat-12-64bit = %{version}-%{release}
Conflicts: %selfconflict libgnat-12-64bit%{nil} Conflicts: %selfconflict libgnat-12-64bit
%description -n libada12-64bit %description -n libada12-64bit
This package contains the shared libraries required to run programs This package contains the shared libraries required to run programs