Accepting request 1055810 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055810
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=643
This commit is contained in:
Andreas Schwab 2023-01-16 12:07:19 +00:00 committed by Git OBS Bridge
parent 628283035c
commit ea28dc0c04
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 12:24:54 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Thu Dec 15 23:25:15 UTC 2022 - Andreas Schwab <schwab@suse.de>

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
@ -43,7 +43,7 @@
%define sysroot %{_prefix}/%{binutils_os}/sys-root
%endif
%if 0%{?usrmerged} || 0%{?suse_version} >= 1550
%if 0%{?suse_version} >= 1550
%bcond_without usrmerged
%else
%bcond_with usrmerged