From 2ae952392f05eaf9fce486b49b174475b1397477 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 15:19:09 +0000
Subject: auto-import changelog data from zsh-3.0.8-8.src.rpm

Tue Feb 27 2001 Preston Brown <pbrown@redhat.com>
- noreplace config files.
Thu Feb 15 2001 Trond Eivind Glomsr�d <teg@redhat.com>
- Handle RLIMIT_LOCKS in 2.4 (#27834 - patch from H.J. Lu)
Mon Jan 08 2001 Trond Eivind Glomsr�d <teg@redhat.com>
- rebuild to fix #23568 (empty signal list)
Tue Nov 28 2000 Trond Eivind Glomsr�d <teg@redhat.com>
- fix the post script, so we only have only line for zsh and can remove the
    trigger
- get rid of some instances of "/usr/local/bin/zsh"

---

diff --git a/zsh.spec b/zsh.spec
index 3310374..c644fa0 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: A shell similar to ksh, but with improvements.
 Name: zsh
 Version: 3.0.8
-Release: 4
+Release: 8
 Copyright: GPL
 Group: System Environment/Shells
 Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.gz
@@ -11,6 +11,8 @@ Source3: zprofile.rhs
 Source4: zshrc.rhs
 Source5: zshenv.rhs
 Patch0: zsh-3.0.8-doc.patch
+Patch1: zsh-3.0.8-nousrlocal.patch
+Patch2: zsh-3.0.4-rlimitlock.path
 Prereq: fileutils grep /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
@@ -28,6 +30,8 @@ Install the zsh package if you'd like to try out a different shell.
 
 %setup -q
 %patch0 -p1
+%patch1 -p1 
+%patch2 -p1
 
 %build
 
@@ -60,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 if [ ! -f /etc/shells ] ; then
     echo "/bin/zsh" > /etc/shells
 else
-    echo "/bin/zsh" >> /etc/shells
+    ! grep -q /bin/zsh /etc/shells && echo "/bin/zsh" >> /etc/shells
 fi
 
 /sbin/install-info %{_infodir}/zsh.info.gz %{_infodir}/dir \
@@ -83,14 +87,6 @@ if [ "$1" = 0 ] ; then
     fi
 fi
 
-%triggerpostun -- zsh <= 3.0.7-2
-if [ ! -f /etc/shells ] ; then
-    echo "/bin/zsh" > /etc/shells
-else
-    echo "/bin/zsh" >> /etc/shells
-fi
-
-
 %files
 %defattr(-,root,root)
 %doc BUGS CONTRIBUTORS ChangeLog FAQ FEATURES META-FAQ NEWS README
@@ -99,9 +95,23 @@ fi
 /bin/zsh-%{version}
 %{_mandir}/*/*
 %{_infodir}/*
-%config /etc/*
+%config(noreplace) /etc/*
 
 %changelog
+* Tue Feb 27 2001 Preston Brown <pbrown@redhat.com>
+- noreplace config files.
+
+* Thu Feb 15 2001 Trond Eivind Glomsr�d <teg@redhat.com>
+- Handle RLIMIT_LOCKS in 2.4 (#27834 - patch from H.J. Lu)
+
+* Mon Jan 08 2001 Trond Eivind Glomsr�d <teg@redhat.com>
+- rebuild to fix #23568  (empty signal list)
+
+* Tue Nov 28 2000 Trond Eivind Glomsr�d <teg@redhat.com>
+- fix the post script, so we only have only line for zsh
+  and can remove the trigger
+- get rid of some instances of "/usr/local/bin/zsh"
+
 * Mon Nov 20 2000 Bill Nottingham <notting@redhat.com>
 - fix ia64 build