Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package zsh for openSUSE:Factory checked in
at 2023-01-31 16:08:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zsh (Old)
and /work/SRC/openSUSE:Factory/.zsh.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zsh"
Tue Jan 31 16:08:31 2023 rev:100 rq:1062030 version:5.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/zsh/zsh.changes 2022-10-27 13:54:27.688655998
+0200
+++ /work/SRC/openSUSE:Factory/.zsh.new.32243/zsh.changes 2023-01-31
16:23:09.214662479 +0100
@@ -1,0 +2,5 @@
+Tue Dec 27 13:27:44 UTC 2022 - Ludwig Nussel <lnus...@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check
(boo#1206798)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zsh.spec ++++++
--- /var/tmp/diff_new_pack.cLC3Do/_old 2023-01-31 16:23:09.730665588 +0100
+++ /var/tmp/diff_new_pack.cLC3Do/_new 2023-01-31 16:23:09.738665636 +0100
@@ -1,7 +1,7 @@
#
# spec file for package zsh
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -67,7 +67,7 @@
Requires(pre): fileutils
Requires(pre): grep
%endif
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
Provides: /bin/zsh
%endif
@@ -186,7 +186,7 @@
install -D -m 0644 %{SOURCE16} %{buildroot}%{_sysconfdir}/skel/.zshrc
%endif
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
# link zsh binary
%if 0%{?suse_version} || 0%{?rhel} <= 6
ln -sf %{_bindir}/zsh %{buildroot}/bin/zsh
@@ -279,7 +279,7 @@
%endif
%{_bindir}/zsh
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
%if 0%{?suse_version} || 0%{?rhel} <= 6
/bin/zsh
%endif
