pool/zsh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1055755 from home:lnussel:usrmerge

Browse Source 
Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055755
OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=240
This commit is contained in:
Paolo Perego 2023-01-30 11:12:20 +00:00 committed by Git OBS Bridge
parent a70a866590
commit 0f9c771bf1
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zsh.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:27:44 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 22 05:22:28 UTC 2022 - Luciano Santos <luc14n0@opensuse.org> Sat Oct 22 05:22:28 UTC 2022 - Luciano Santos <luc14n0@opensuse.org>

8
zsh.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package zsh # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -67,7 +67,7 @@ Requires(pre): /sbin/install-info
Requires(pre): fileutils Requires(pre): fileutils
Requires(pre): grep Requires(pre): grep
%endif %endif
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
Provides: /bin/zsh Provides: /bin/zsh
%endif %endif
@ -186,7 +186,7 @@ done
install -D -m 0644 %{SOURCE16} %{buildroot}%{_sysconfdir}/skel/.zshrc install -D -m 0644 %{SOURCE16} %{buildroot}%{_sysconfdir}/skel/.zshrc
%endif %endif
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
# 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
@ -279,7 +279,7 @@ mv Test/E01options.ztst Test/E01options.ztst.mvd
%endif %endif
%{_bindir}/zsh %{_bindir}/zsh
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
%if 0%{?suse_version} || 0%{?rhel} <= 6 %if 0%{?suse_version} || 0%{?rhel} <= 6
/bin/zsh /bin/zsh
%endif %endif