From 2cc004c0f351094779777c33b54d153b9840e958 Mon Sep 17 00:00:00 2001
From: jantill <jantill@fedoraproject.org>
Date: Mon, 5 Mar 2007 20:20:09 +0000
Subject: [PATCH] - Move requires to be scriptlet specific - chmod functions,
 to shut rpmlint up (false positive warning) - sed only the requied functions
 (again, shuts rpmlint up) - Remove zsh-4.0.6-make-test-fail.patch - Remove
 RPM_SOURCE_DIR var, using %{SOURCEx} and basename Resolves:     rhbz#226813

---
 zsh.spec | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/zsh.spec b/zsh.spec
index fcb4ccd..5d27b03 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.2.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -16,12 +16,14 @@ Source5: zshenv.rhs
 Source6: dotzshrc
 Source7: zshprompt.pl
 Patch0: zsh-serial.patch
-Patch1: zsh-4.0.6-make-test-fail.patch
+#Patch1: zsh-4.0.6-make-test-fail.patch
 #Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch
 Prereq: fileutils grep /sbin/install-info
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: mktemp coreutils grep info
-BuildRequires: ncurses-devel libcap-devel texinfo tetex texi2html
+BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel texinfo tetex texi2html
+Requires(post): /sbin/install-info grep
+Requires(preun): /sbin/install-info
+Requires(postun): mktemp coreutils grep
 
 %description
 The zsh shell is a command interpreter usable as an interactive login
@@ -84,15 +86,22 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/zsh-%{version}
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
-for i in zshrc zlogin zlogout zshenv zprofile; do
-    install -m 644 $RPM_SOURCE_DIR/${i}.rhs ${RPM_BUILD_ROOT}%{_sysconfdir}/$i
+for i in %{SOURCE4} %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE3}; do
+    install -m 644 $i ${RPM_BUILD_ROOT}%{_sysconfdir}/"$(basename $i .rhs)"
 done
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/skel
 install -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/skel/.zshrc
 
-sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \
-  ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/*
+# This is just here to shut up rpmlint, and is very annoying.
+# Note that we can't chmod everything as then rpmlint will complain about
+# those without a she-bang line.
+for i in checkmail harden run-help zcalc zkbd; do
+    sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \
+      ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/$i
+    chmod +x ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/$i
+done
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -142,11 +151,19 @@ fi
 %doc Doc/zsh/*.html
 
 %changelog
+* 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)
+- sed only the requied functions (again, shuts rpmlint up)
+- Remove zsh-4.0.6-make-test-fail.patch
+- Remove RPM_SOURCE_DIR var, using %%{SOURCEx} and basename
+Resolves: rhbz#226813
+
 * Tue Feb 27 2007 James Antill <james@and.org> - 4.2.6-5
 - Fix sed typo.
 - Fix skel expansion problem.
 - Add Requires for mktemp/info/etc.
-- Use cp again due to SELinux context.
+- Use cp again due to SELinux context
 Resolves: rhbz#226813
 
 * Tue Feb 27 2007 James Antill <james@and.org> - 4.2.6-4