Accepting request 1068241 from shells

- Disabled zsh-sh subpackage generation for Leap 15.4 to prevent an error when
  building the package.
- don't require yodl for build, doc is not regenerated anyway

OBS-URL: https://build.opensuse.org/request/show/1068241
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zsh?expand=0&rev=101

zsh.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Feb 28 16:40:02 UTC 2023 - Paolo Perego <paolo.perego@suse.com>
+
+- Disabled zsh-sh subpackage generation for Leap 15.4 to prevent an error when
+  building the package.
+
+-------------------------------------------------------------------
+Tue Feb 28 10:41:17 UTC 2023 - pgajdos@suse.com
+
+- don't require yodl for build, doc is not regenerated anyway
+
 -------------------------------------------------------------------
 Tue Dec 27 13:27:44 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
 

zsh.spec

@@ -56,7 +56,6 @@ Source16:       dotzshrc.rh
 %endif
 %if 0%{?suse_version}
 BuildRequires:  fdupes
-BuildRequires:  yodl
 Requires(pre):  %{install_info_prereq}
 %if 0%{?suse_version} >= 1210
 BuildRequires:  makeinfo
@@ -95,6 +94,7 @@ mechanism, and more.
 
 This package contains the Zsh manual in HTML format.
 
+%if 0%{?suse_version} >= 1550
 %package sh
 Summary:        Handle behaviour of /bin/sh
 Group:          System/Shells
@@ -105,6 +105,7 @@ BuildArch:      noarch
 
 %description sh
 Use zsh as /bin/sh implementation.
+%endif
 
 %prep
 %setup -q
@@ -206,7 +207,7 @@ rm -f %{buildroot}/%{_infodir}/dir
 #
 # Create the symlink required for zsh-sh to handle /bin/sh
 #
-%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1550
   ln -s %{_bindir}/zsh %{buildroot}%{_bindir}/sh
 %endif
 
@@ -292,7 +293,9 @@ mv Test/E01options.ztst Test/E01options.ztst.mvd
 %files htmldoc
 %doc Doc/htmldoc/*
 
+%if 0%{?suse_version} >= 1550
 %files sh
 %{_bindir}/sh
+%endif
 
 %changelog