Dominique Leuenberger 2020-12-02 12:57:45 +00:00 committed by Git OBS Bridge
commit 4fa6431db8
2 changed files with 12 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 16 10:27:34 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 25 13:25:50 UTC 2020 - Martin Liška <mliska@suse.cz> Tue Aug 25 13:25:50 UTC 2020 - Martin Liška <mliska@suse.cz>

View File

@ -66,6 +66,9 @@ Requires(pre): /sbin/install-info
Requires(pre): fileutils Requires(pre): fileutils
Requires(pre): grep Requires(pre): grep
%endif %endif
%if 0%{?usrmerged}
Provides: /bin/zsh
%endif
%description %description
Zsh is a UNIX command interpreter (shell) that resembles the Korn shell 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 install -D -m 0644 %{SOURCE16} %{buildroot}%{_sysconfdir}/skel/.zshrc
%endif %endif
%if !0%{?usrmerged}
# link zsh binary # link zsh binary
%if 0%{?suse_version} || 0%{?rhel} <= 6 %if 0%{?suse_version} || 0%{?rhel} <= 6
ln -sf %{_bindir}/zsh %{buildroot}/bin/zsh ln -sf %{_bindir}/zsh %{buildroot}/bin/zsh
%endif %endif
%endif
# Remove versioned zsh binary # Remove versioned zsh binary
rm -f %{buildroot}%{_bindir}/zsh-* rm -f %{buildroot}%{_bindir}/zsh-*
@ -260,9 +265,11 @@ fi
%endif %endif
%{_bindir}/zsh %{_bindir}/zsh
%if !0%{?usrmerged}
%if 0%{?suse_version} || 0%{?rhel} <= 6 %if 0%{?suse_version} || 0%{?rhel} <= 6
/bin/zsh /bin/zsh
%endif %endif
%endif
%{_libdir}/zsh/ %{_libdir}/zsh/
%{_datadir}/zsh/ %{_datadir}/zsh/
%{_infodir}/zsh.info*%{ext_info} %{_infodir}/zsh.info*%{ext_info}