From 5e43cb6922d539f706d7ff30bc5c9fe6908209ee4ad4aa3ea6950aa6a578cf60 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 5 Jan 2023 07:51:10 +0000 Subject: [PATCH] Accepting request 1055737 from home:lnussel:usrmerge Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1055737 OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=50 --- sed.changes | 5 +++++ sed.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sed.changes b/sed.changes index 0d23057..8ed04c2 100644 --- a/sed.changes +++ b/sed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 13:20:23 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Mon Nov 7 18:49:22 UTC 2022 - Andreas Stieger diff --git a/sed.spec b/sed.spec index 8c68479..f8f0503 100644 --- a/sed.spec +++ b/sed.spec @@ -51,7 +51,7 @@ export LDFLAGS="-pie" %install %make_install -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 mkdir -p %{buildroot}/bin ln -s %{_bindir}/sed %{buildroot}/bin/sed %endif @@ -63,7 +63,7 @@ ln -s %{_bindir}/sed %{buildroot}/bin/sed %files %license COPYING* %doc AUTHORS BUGS NEWS README* THANKS -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /bin/sed %endif %{_bindir}/sed