rpms/zsh/devel zsh-test-C02-dev_fd-mock.patch, NONE, 1.1 zsh.spec, 1.46, 1.47

[James Antill]

Author: james

Update of /cvs/pkgs/rpms/zsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26924

Modified Files:
	zsh.spec 
Added Files:
	zsh-test-C02-dev_fd-mock.patch 
Log Message:
* Mon Aug 25 2008 James Antill <james at fedoraproject.org> - 4.3.6-3
- 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


zsh-test-C02-dev_fd-mock.patch:

--- NEW FILE zsh-test-C02-dev_fd-mock.patch ---
diff -ru zsh-4.3.6-orig/Test/C02cond.ztst zsh-4.3.6/Test/C02cond.ztst
--- zsh-4.3.6-orig/Test/C02cond.ztst	2008-02-27 06:41:13.000000000 -0500
+++ zsh-4.3.6/Test/C02cond.ztst	2008-08-25 17:39:13.000000000 -0400
@@ -180,7 +180,8 @@
     print -u$ZTST_fd "Warning: not testing [[ -e /dev/fd/0 ]] (/dev/fd not supported)"
     true
   else
-    [[ -e /dev/fd/0 ]]
+    print -u$ZTST_fd "Warning: not testing: [[ -e /dev/fd/0 ]] (mock kills us)"
+    true
   fi
 0dD:/dev/fd support in conds handled by access
 
@@ -188,7 +189,8 @@
     print -u$ZTST_fd "Warning: not testing [[ -O /dev/fd/0 ]] (/dev/fd not supported)"
     true
   else
-    [[ -O /dev/fd/0 ]]
+    print -u$ZTST_fd "Warning: not testing: [[ -O /dev/fd/0 ]] (mock kills us)"
+    true
   fi
 0dD:/dev/fd support in conds handled by stat
 


Index: zsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- zsh.spec	25 Aug 2008 21:28:25 -0000	1.46
+++ zsh.spec	25 Aug 2008 21:41:13 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.3.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -21,6 +21,7 @@
 #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
 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
@@ -55,6 +56,7 @@
 %setup -q
 %patch0 -p1 -b .serial
 %patch4 -p1 -b .8bit-prompts
+%patch5 -p1 -b .8bit-prompts
 #autoconf
 
 cp -p %SOURCE7 .
@@ -154,10 +156,12 @@
 %doc Doc/*.html
 
 %changelog
-* Mon Aug 25 2008 James Antill <james at fedoraproject.org> - 4.3.6-2
+* Mon Aug 25 2008 James Antill <james at fedoraproject.org> - 4.3.6-3
 - 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
 
 * 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