diff --git a/ed.changes b/ed.changes index 791e54b..ec6a874 100644 --- a/ed.changes +++ b/ed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 16 09:46:50 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Tue Mar 3 10:22:48 UTC 2020 - Paolo Stivanin diff --git a/ed.spec b/ed.spec index 7cfbee2..eda74c9 100644 --- a/ed.spec +++ b/ed.spec @@ -49,10 +49,10 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" %install %make_install -#UsrMerge +%if !0%{?usrmerged} install -d -m 0755 %{buildroot}/bin ln -s %{_bindir}/ed %{buildroot}/bin/ed -#UsrMerge +%endif %check make %{?_smp_mflags} check @@ -66,7 +66,9 @@ make %{?_smp_mflags} check %files %license COPYING %doc AUTHORS ChangeLog NEWS README TODO +%if !0%{?usrmerged} /bin/%{name} +%endif %{_bindir}/%{name} %{_bindir}/r%{name} %{_infodir}/%{name}.info%{?ext_info}