Accepting request 850973 from Base:System

OBS-URL: https://build.opensuse.org/request/show/850973
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sed?expand=0&rev=36

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>
 

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}