rpms/zsh/devel zsh-4.3.6-hack-a01grammar-test-select-off.patch, NONE, 1.1 zsh.spec, 1.49, 1.50
James Antill
james at fedoraproject.org
Tue Aug 26 05:05:03 UTC 2008
Author: james
Update of /cvs/pkgs/rpms/zsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22652
Modified Files:
zsh.spec
Added Files:
zsh-4.3.6-hack-a01grammar-test-select-off.patch
Log Message:
* Mon Aug 25 2008 James Antill <james at fedoraproject.org> - 4.3.6-5
- Import new upstream 4.3.6
- Rebase 8bit prompt patch
- Add patch fuzz=2
- Add BuildReq on /bin/hostname directly
- FIXME: These should all be unpatched, at some point.
- Don't test /dev/fd as mock doesn't like it
- Don't test the modload module, as mock doesn't like loading them all
- Don't test the select test in A01grammar, stdin/stderr racy?
zsh-4.3.6-hack-a01grammar-test-select-off.patch:
--- NEW FILE zsh-4.3.6-hack-a01grammar-test-select-off.patch ---
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~
Index: zsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- zsh.spec 26 Aug 2008 04:35:21 -0000 1.49
+++ zsh.spec 26 Aug 2008 05:04:33 -0000 1.50
@@ -3,7 +3,7 @@
Summary: A powerful interactive shell
Name: zsh
Version: 4.3.6
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
URL: http://zsh.sunsite.dk/
Group: System Environment/Shells
@@ -22,6 +22,7 @@
#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
Prereq: fileutils grep /sbin/install-info
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel
@@ -56,8 +57,9 @@
%setup -q
%patch0 -p1 -b .serial
-%patch4 -p1 -b .8bit-prompts
-%patch5 -p1 -b .8bit-prompts
+%patch4 -p1 -b
+%patch5 -p1 -b
+%patch6 -p1 -b
#autoconf
cp -p %SOURCE7 .
@@ -161,13 +163,15 @@
%doc Doc/*.html
%changelog
-* Mon Aug 25 2008 James Antill <james at fedoraproject.org> - 4.3.6-4
+* Mon Aug 25 2008 James Antill <james at fedoraproject.org> - 4.3.6-5
- Import new upstream 4.3.6
- Rebase 8bit prompt patch
- Add patch fuzz=2
- Add BuildReq on /bin/hostname directly
+- FIXME: These should all be unpatched, at some point.
- Don't test /dev/fd as mock doesn't like it
- Don't test the modload module, as mock doesn't like loading them all
+- Don't test the select test in A01grammar, stdin/stderr racy?
* Thu Jan 31 2008 James Antill <james at fedoraproject.org> - 4.3.4-7
- Tweak /etc/zshrc to source /etc/profile.d/*.sh in ksh compat. mode
More information about the fedora-extras-commits
mailing list