diff --git a/gzip.changes b/gzip.changes index 4f7df65..b8b4a1c 100644 --- a/gzip.changes +++ b/gzip.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 16 09:48:53 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Wed Sep 2 14:12:24 UTC 2020 - Kristyna Streitova diff --git a/gzip.spec b/gzip.spec index 6171900..6d9ab67 100644 --- a/gzip.spec +++ b/gzip.spec @@ -106,10 +106,10 @@ done %install %make_install -#UsrMerge +%if !0%{?usrmerged} mkdir -p %{buildroot}/bin ln -sf %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat %{buildroot}/bin -#EndUsrMerge +%endif ln -sf zmore %{buildroot}%{_bindir}/zless ln -sf zmore.1 %{buildroot}%{_mandir}/man1/zless.1 @@ -122,11 +122,11 @@ ln -sf zmore.1 %{buildroot}%{_mandir}/man1/zless.1 %files %license COPYING %doc README AUTHORS ChangeLog TODO NEWS THANKS -#UsrMerge +%if !0%{?usrmerged} /bin/gunzip /bin/gzip /bin/zcat -#EndUsrMerge +%endif %{_bindir}/gunzip %{_bindir}/gzexe %{_bindir}/gzip