From ea28dc0c042467b9603fd8f4efdf82e29dbd49179662a02fbc2afdf28aa0b4ab Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 16 Jan 2023 12:07:19 +0000 Subject: [PATCH] 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 --- glibc.changes | 5 +++++ glibc.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/glibc.changes b/glibc.changes index 7ca43df..2ce6cd5 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 12:24:54 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Thu Dec 15 23:25:15 UTC 2022 - Andreas Schwab diff --git a/glibc.spec b/glibc.spec index b79cd4b..bd85d45 100644 --- a/glibc.spec +++ b/glibc.spec @@ -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