From f2d637189f904d5428c560022f4874d597ed75eca7019c1a4c30c9235b65909f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 17 Apr 2012 12:01:38 +0000 Subject: [PATCH 1/2] Don't need this workaround anymore OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=102 --- zsh.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/zsh.spec b/zsh.spec index 3c8ec05..8b8006c 100644 --- a/zsh.spec +++ b/zsh.spec @@ -109,11 +109,7 @@ perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \ --enable-cap \ --enable-multibyte \ --enable-pcre \ -%if 0%{?suse_version} >= 1220 - --with-term-lib="ncursesw tinfo" \ -%else --with-term-lib="ncursesw" \ -%endif --enable-cflags="%{optflags} %(ncursesw6-config --cflags)" \ --enable-ldflags="%(ncursesw6-config --libs)" From 7af91c9fb0e040ca0482d8e7a79cfb60eb7dad2c86e4b25f71f5f8e7952a29d7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 19 Jul 2012 23:57:32 +0000 Subject: [PATCH 2/2] Accepting request 128306 from home:coolo:branches:openSUSE:Factory - buildrequire makeinfo to fix build OBS-URL: https://build.opensuse.org/request/show/128306 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=103 --- zsh.changes | 5 +++++ zsh.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/zsh.changes b/zsh.changes index 5bfd17f..a2a20d8 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 19 07:58:15 UTC 2012 - coolo@suse.com + +- buildrequire makeinfo to fix build + ------------------------------------------------------------------- Mon Feb 27 09:11:27 UTC 2012 - idonmez@suse.com diff --git a/zsh.spec b/zsh.spec index 8b8006c..6743a4f 100644 --- a/zsh.spec +++ b/zsh.spec @@ -43,6 +43,9 @@ Requires(pre): %{install_info_prereq} BuildRequires: fdupes BuildRequires: yodl %endif +%if 0%{?suse_version} >= 1210 +BuildRequires: makeinfo +%endif %else Requires(pre): /sbin/install-info Requires(pre): fileutils