From d89dfc793585cdec3f394105a2468075df4918127158023e2f684e90539097ac Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 4 Jan 2023 11:05:54 +0000 Subject: [PATCH] Accepting request 1055712 from home:lnussel:usrmerge Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1055712 OBS-URL: https://build.opensuse.org/package/show/Base:System/mawk?expand=0&rev=29 --- mawk.changes | 5 +++++ mawk.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mawk.changes b/mawk.changes index c92e566..342510c 100644 --- a/mawk.changes +++ b/mawk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 13:10:01 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Thu Sep 23 14:03:54 UTC 2021 - Manfred Schwarb diff --git a/mawk.spec b/mawk.spec index b04461a..5b7bc15 100644 --- a/mawk.spec +++ b/mawk.spec @@ -54,7 +54,7 @@ chmod 755 examples/* %install %make_install -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 # compatibility symlink install -d -m 755 %{buildroot}/bin ln -s %{_bindir}/mawk %{buildroot}/bin/mawk @@ -68,7 +68,7 @@ ln -s %{_bindir}/mawk %{buildroot}/bin/mawk %doc ACKNOWLEDGMENT CHANGES README examples/ %{_bindir}/mawk %{_mandir}/man1/mawk.1%{?ext_man} -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /bin/mawk %endif