From 5de068c48d3983e524e6a63fd0312740cef21e04da04d05dab1d600bb6fe9bd0 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 26 Nov 2020 10:07:17 +0000
Subject: [PATCH] Accepting request 849683 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849683
OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=46
---
 sed.changes | 5 +++++
 sed.spec    | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sed.changes b/sed.changes
index ed19d4d..76904ca 100644
--- a/sed.changes
+++ b/sed.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 16 08:47:29 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Aug 31 07:00:11 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>
 
diff --git a/sed.spec b/sed.spec
index c033e78..ad7d840 100644
--- a/sed.spec
+++ b/sed.spec
@@ -66,10 +66,10 @@ make %{?_smp_mflags} check
 
 %install
 %make_install
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir -p %{buildroot}/bin
 ln -s %{_bindir}/sed %{buildroot}/bin/sed
-#EndUserMerge
+%endif
 %find_lang %{name}
 
 %check
@@ -85,7 +85,9 @@ make %{?_smp_mflags} check
 %files
 %license COPYING*
 %doc AUTHORS BUGS NEWS README* THANKS
+%if !0%{?usrmerged}
 /bin/sed
+%endif
 %{_bindir}/sed
 %{_mandir}/man*/*%{ext_man}
 %{_infodir}/sed.info*%{ext_info}