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 + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Mon Aug 31 07:00:11 UTC 2020 - Bernhard Voelker 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}