From 104f9d30f0a19b9ba0a85d1971932a6cd8de020d Mon Sep 17 00:00:00 2001
From: James Antill <james@fedoraproject.org>
Date: Wed, 25 Jul 2007 14:57:18 +0000
Subject: [PATCH] - Move to upstream 4.3.4, the stable non-stable release

---
 .cvsignore |  2 +-
 sources    |  2 +-
 zsh.spec   | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 11ad19b..61879c7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zsh-4.2.6.tar.bz2
+zsh-4.3.4.tar.gz
diff --git a/sources b/sources
index ed86314..08d8b20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2cefebf742c190cbc611baded825db64  zsh-4.2.6.tar.bz2
+acc4fc85d18d7f914bb6705775c45bf2  zsh-4.3.4.tar.gz
diff --git a/zsh.spec b/zsh.spec
index 5d27b03..54ba2ea 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -2,12 +2,12 @@
 
 Summary: A powerful interactive shell
 Name: zsh
-Version: 4.2.6
-Release: 6%{?dist}
+Version: 4.3.4
+Release: 0%{?dist}
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
-Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.bz2
+Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.gz
 Source1: zlogin.rhs
 Source2: zlogout.rhs
 Source3: zprofile.rhs
@@ -51,9 +51,6 @@ This package contains the Zsh manual in html format.
 
 %setup -q
 %patch0 -p1 -b .serial
-#%patch1 -p1 -b .fail
-#%%patch3 -p0 -b .bckgrnd
-## patch3 touches zshconfig.ac
 #autoconf
 
 cp -p %SOURCE7 .
@@ -80,7 +77,9 @@ make all html
 rm -rf $RPM_BUILD_ROOT
 %makeinstall install.info \
   fndir=$RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions \
-  sitefndir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
+  sitefndir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions \
+  scriptdir=$RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/scripts \
+  sitescriptdir=$RPM_BUILD_ROOT%{_datadir}/zsh/scripts
 
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/zsh-%{version}
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -148,9 +147,12 @@ fi
 
 %files html
 %defattr(-,root,root)
-%doc Doc/zsh/*.html
+%doc Doc/*.html
 
 %changelog
+* Wed Jul 25 2007 James Antill <jantill@redhat.com> - 4.3.4-0
+- Move to upstream 4.3.4, the stable non-stable release
+
 * Mon Mar  5 2007 James Antill <james@and.org> - 4.2.6-6
 - Move requires to be scriptlet specific
 - chmod functions, to shut rpmlint up (false positive warning)