From d9db358b8f24a17d6cda2ff6d0a2b2b9e5148bdc Mon Sep 17 00:00:00 2001 From: James Antill Date: Aug 26 2008 04:12:17 +0000 Subject: - Import new upstream 4.3.6 - Rebase 8bit prompt patch. - Add patch fuzz=2 - Add BuildReq on /bin/hostname directly - Don't test /dev/fd as mock doesn't like it --- diff --git a/zsh.spec b/zsh.spec index a053472..9b02231 100644 --- a/zsh.spec +++ b/zsh.spec @@ -24,7 +24,8 @@ Patch4: zsh-4.3.6-8bit-prompts.patch Patch5: zsh-test-C02-dev_fd-mock.patch Prereq: fileutils grep /sbin/install-info Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel texinfo tetex texi2html gawk /bin/hostname +BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel +BuildRequires: texinfo tetex texi2html gawk /bin/hostname Requires(post): /sbin/install-info grep Requires(preun): /sbin/install-info Requires(postun): mktemp coreutils grep @@ -72,12 +73,15 @@ make all html %check # Run the testsuite # the completion tests hang on s390 and s390x -%ifarch s390 s390x ppc ppc64 ( cd Test mkdir skipped - mv Y*.ztst skipped ) +%ifarch s390 s390x ppc ppc64 + mv Y*.ztst skipped %endif - ZTST_verbose=0 make test + # FIXME: This hangs in mock + # mv V01zmodload.ztst skipped + true ) + ZTST_verbose=1 make test %install rm -rf $RPM_BUILD_ROOT