From 3f163a21c74a6f01dc39a8402efe6fdc2791f728 Mon Sep 17 00:00:00 2001 From: Dominic Hopf Date: Sat, 3 Dec 2011 17:37:23 +0100 Subject: [PATCH] Update to new upstream version: Zsh 4.3.12 --- ....3.6-hack-a01grammar-test-select-off.patch | 32 ------------------- zsh.spec | 12 +++---- 2 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 zsh-4.3.6-hack-a01grammar-test-select-off.patch diff --git a/zsh-4.3.6-hack-a01grammar-test-select-off.patch b/zsh-4.3.6-hack-a01grammar-test-select-off.patch deleted file mode 100644 index 02eb817..0000000 --- a/zsh-4.3.6-hack-a01grammar-test-select-off.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru zsh-4.3.6-orig/Test/A01grammar.ztst zsh-4.3.6/Test/A01grammar.ztst ---- zsh-4.3.6-orig/Test/A01grammar.ztst 2007-12-11 09:47:54.000000000 -0500 -+++ zsh-4.3.6/Test/A01grammar.ztst 2008-08-26 01:01:57.000000000 -0400 -@@ -250,16 +250,17 @@ - - ## Select now reads from stdin if the shell is not interactive. - ## Its own output goes to stderr. -- (COLUMNS=80 -- PS3="input> " -- select name in one two three; do -- print $name -- done) --0:`select' loop --<2 --?1) one 2) two 3) three --?input> input> -->two -+# FIXME: This seems to be racy under mock ... is it zsh, or mock, or kernel? -+# (COLUMNS=80 -+# PS3="input> " -+# select name in one two three; do -+# print $name -+# done) -+#0:`select' loop -+#<2 -+#?1) one 2) two 3) three -+#?input> input> -+#>two - - function name1 name2 () { print This is $0; } - name2 -Only in zsh-4.3.6/Test: A01grammar.ztst~ diff --git a/zsh.spec b/zsh.spec index 65ddcf7..3032cb6 100644 --- a/zsh.spec +++ b/zsh.spec @@ -2,8 +2,8 @@ Summary: Powerful interactive shell Name: zsh -Version: 4.3.11 -Release: 2%{?dist} +Version: 4.3.12 +Release: 1%{?dist} License: BSD URL: http://zsh.sunsite.dk/ Group: System Environment/Shells @@ -18,11 +18,8 @@ Source7: zshprompt.pl # Give me better tools or die! %global _default_patch_fuzz 2 Patch0: zsh-serial.patch -#Patch1: zsh-4.0.6-make-test-fail.patch -#Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch Patch4: zsh-4.3.6-8bit-prompts.patch Patch5: zsh-test-C02-dev_fd-mock.patch -Patch6: zsh-4.3.6-hack-a01grammar-test-select-off.patch Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel BuildRequires: texinfo tetex texi2html gawk /bin/hostname @@ -58,8 +55,6 @@ This package contains the Zsh manual in html format. %patch0 -p1 -b .serial %patch4 -p1 %patch5 -p1 -%patch6 -p1 -#autoconf cp -p %SOURCE7 . @@ -174,6 +169,9 @@ fi %doc Doc/*.html %changelog +* Sat Aug 13 2011 Dominic Hopf - 4.3.12-1 +- Update to new upstream version: Zsh 4.3.12 + * Tue Feb 08 2011 Fedora Release Engineering - 4.3.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild