From ebf2457ef131f996a0583dc9b165cd537c9619959fd228fc03a213a1e64cd572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 30 Nov 2020 17:59:42 +0000 Subject: [PATCH] Accepting request 851919 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/851919 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=230 --- zsh.changes | 5 +++++ zsh.spec | 7 +++++++ 2 files changed, 12 insertions(+) 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}