diff --git a/zsh.changes b/zsh.changes index b48ddf7..97e0324 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 16 10:27:34 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Tue Aug 25 13:25:50 UTC 2020 - Martin Liška diff --git a/zsh.spec b/zsh.spec index 807ef9d..532cb94 100644 --- a/zsh.spec +++ b/zsh.spec @@ -66,6 +66,9 @@ Requires(pre): /sbin/install-info Requires(pre): fileutils Requires(pre): grep %endif +%if 0%{?usrmerged} +Provides: /bin/zsh +%endif %description Zsh is a UNIX command interpreter (shell) that resembles the Korn shell @@ -171,10 +174,12 @@ done install -D -m 0644 %{SOURCE16} %{buildroot}%{_sysconfdir}/skel/.zshrc %endif +%if !0%{?usrmerged} # link zsh binary %if 0%{?suse_version} || 0%{?rhel} <= 6 ln -sf %{_bindir}/zsh %{buildroot}/bin/zsh %endif +%endif # Remove versioned zsh binary rm -f %{buildroot}%{_bindir}/zsh-* @@ -260,9 +265,11 @@ fi %endif %{_bindir}/zsh +%if !0%{?usrmerged} %if 0%{?suse_version} || 0%{?rhel} <= 6 /bin/zsh %endif +%endif %{_libdir}/zsh/ %{_datadir}/zsh/ %{_infodir}/zsh.info*%{ext_info}