From e47366549f9d8d9b98fa32f96bba7b5fd8f095e2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@fedoraproject.org>
Date: Jan 03 2005 21:20:49 +0000
Subject: release 4.2.1-


---

diff --git a/.cvsignore b/.cvsignore
index ce717d5..e805620 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 zsh-4.2.0.tar.bz2
+zsh-4.2.1.tar.bz2
diff --git a/sources b/sources
index 894aab6..2370f68 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 866bcdad8c0c4974650f5eff395a9a35  zsh-4.2.0.tar.bz2
+b59ef34b8de288d5fd16f842451125c8  zsh-4.2.1.tar.bz2
diff --git a/zsh-4.0.6-make-test-fail.patch b/zsh-4.0.6-make-test-fail.patch
index 0700e22..644a8af 100644
--- a/zsh-4.0.6-make-test-fail.patch
+++ b/zsh-4.0.6-make-test-fail.patch
@@ -1,12 +1,11 @@
-diff -u zsh-4.0.6/Test/Makefile.in~ zsh-4.0.6/Test/Makefile.in
---- zsh-4.0.6/Test/Makefile.in~	2002-11-25 11:03:59.000000000 +0900
-+++ zsh-4.0.6/Test/Makefile.in	2002-11-25 11:03:59.000000000 +0900
+--- zsh-4.2.1/Test/Makefile.in~	2005-01-03 15:44:16.507782023 -0500
++++ zsh-4.2.1/Test/Makefile.in	2005-01-03 15:46:10.233279513 -0500
 @@ -45,7 +45,7 @@
  	  cd $(dir_top) && DESTDIR= \
  	  $(MAKE) MODDIR=`pwd`/$(subdir)/Modules install.modules > /dev/null; \
  	fi
 -	-for f in $(sdir)/$(TESTNUM)*.ztst; do \
 +	for f in $(sdir)/$(TESTNUM)*.ztst; do \
- 	  $(dir_top)/Src/zsh +Z -f $(sdir)/ztst.zsh $$f; \
+ 	  ZTST_exe=$(dir_top)/Src/zsh \
+ 	    $(dir_top)/Src/zsh +Z -f $(sdir)/ztst.zsh $$f; \
  	done
- 	rm -rf Modules .zcompdump
diff --git a/zsh.spec b/zsh.spec
index d17ed75..ab8978c 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -2,8 +2,8 @@
 
 Summary: A powerful interactive shell
 Name: zsh
-Version: 4.2.0
-Release: 3
+Version: 4.2.1
+Release: 1
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -17,7 +17,6 @@ Source6: dotzshrc
 Source7: zshprompt.pl
 Patch0: zsh-serial.patch
 Patch1: zsh-4.0.6-make-test-fail.patch
-Patch2: zsh-4.2.0-jobtable-125452.patch
 #Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch
 Prereq: fileutils grep /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -53,8 +52,7 @@ This package contains the Zsh manual in html format.
 
 %setup -q
 %patch0 -p1 -b .serial
-%patch1 -p1 -b .fail
-%patch2 -p0 -b .jobtbl
+#%patch1 -p1 -b .fail
 #%%patch3 -p0 -b .bckgrnd
 ## patch3 touches zshconfig.ac
 #autoconf
@@ -128,8 +126,8 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc README LICENCE Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ Etc/FEATURES Etc/MACHINES
-%doc Etc/NEWS Etc/zsh-development-guide Etc/completion-style-guide zshprompt.pl
+%doc README LICENCE Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ FEATURES MACHINES
+%doc NEWS Etc/zsh-development-guide Etc/completion-style-guide zshprompt.pl
 %attr(755,root,root) %{_bindir}/zsh
 %{_mandir}/*/*
 %{_infodir}/*
@@ -142,6 +140,12 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Mon Jan 03 2005 Colin Walters <walters@redhat.com> - 4.2.1-1
+- New upstream version 4.2.1
+- FEATURES, MACHINES, and NEWS moved to toplevel dir
+- Update zsh-4.0.6-make-test-fail.patch, but do not apply it for now
+- Remove upstreamed zsh-4.2.0-jobtable-125452.patch
+
 * Mon Jul  5 2004 Jens Petersen <petersen@redhat.com> - 4.2.0-3
 - source profile in zprofile rather than .zshrc (Péter Kelemen,
   Magnus Gustavsson, 102187,126539)