Accepting request 1055809 from home:lnussel:usrmerge

Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055809
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc11?expand=0&rev=405
This commit is contained in:
Richard Biener 2023-01-09 08:25:59 +00:00 committed by Git OBS Bridge
parent 7cbd9105f4
commit dee214a0c2
57 changed files with 174 additions and 31 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 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

View File

@ -17,7 +17,7 @@
# nospeccleaner
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
%define _slibdir /%{_lib}
%define slibdir /lib
%define slibdir64 /lib64
@ -25,6 +25,7 @@
%define _slibdir %{_libdir}
%define slibdir %{_prefix}/lib
%define slibdir64 %{_prefix}/lib64
%define usrmerged 1
%endif
# Ada currently fails to build on a few platforms, enable it only

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package gcc11-testresults
#
# Copyright (c) 2022 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
@ -37,7 +37,7 @@
# nospeccleaner
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
%define _slibdir /%{_lib}
%define slibdir /lib
%define slibdir64 /lib64
@ -45,6 +45,7 @@
%define _slibdir %{_libdir}
%define slibdir %{_prefix}/lib
%define slibdir64 %{_prefix}/lib64
%define usrmerged 1
%endif
# Ada currently fails to build on a few platforms, enable it only

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:41:18 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Don't rely on %usrmerged, set it based on standard %suse_version
-------------------------------------------------------------------
Mon Oct 24 08:56:14 UTC 2022 - Richard Biener <rguenther@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package gcc11
#
# Copyright (c) 2022 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
@ -16,7 +16,7 @@
#
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
%define _slibdir /%{_lib}
%define slibdir /lib
%define slibdir64 /lib64
@ -24,6 +24,7 @@
%define _slibdir %{_libdir}
%define slibdir %{_prefix}/lib
%define slibdir64 %{_prefix}/lib64
%define usrmerged 1
%endif
# Ada currently fails to build on a few platforms, enable it only