Hello community,
here is the log from the commit of package zsh for openSUSE:Factory checked in
at 2020-12-02 13:57:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zsh (Old)
and /work/SRC/openSUSE:Factory/.zsh.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zsh"
Wed Dec 2 13:57:45 2020 rev:95 rq:851932 version:5.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/zsh/zsh.changes 2020-10-06 17:06:22.061281502
+0200
+++ /work/SRC/openSUSE:Factory/.zsh.new.5913/zsh.changes 2020-12-02
13:57:47.505773976 +0100
@@ -1,0 +2,5 @@
+Fri Oct 16 10:27:34 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zsh.spec ++++++
--- /var/tmp/diff_new_pack.IMQWkx/_old 2020-12-02 13:57:48.225774735 +0100
+++ /var/tmp/diff_new_pack.IMQWkx/_new 2020-12-02 13:57:48.229774739 +0100
@@ -66,6 +66,9 @@
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 @@
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 @@
%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}
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
