From 41d85bb551a9c015fe0386d4875f034806a39c24 Mon Sep 17 00:00:00 2001
From: jantill <jantill@fedoraproject.org>
Date: Wed, 28 Feb 2007 03:46:10 +0000
Subject: [PATCH] - Fix sed typo. - Fix skel expansion problem. - Add Requires
 for mktemp/info/etc. - Use cp again due to SELinux context. Resolves:
 rhbz#226813

---
 zsh.spec | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/zsh.spec b/zsh.spec
index ac25896..fcb4ccd 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.2.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -20,6 +20,7 @@ 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
 
 %description
@@ -90,7 +91,7 @@ done
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/skel
 install -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/skel/.zshrc
 
-sed -ie 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \
+sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \
   ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/*
 
 %clean
@@ -119,9 +120,8 @@ if [ "$1" = 0 ] ; then
     if [ -f %{_sysconfdir}/shells ] ; then
         TmpFile=`%{_bindir}/mktemp /tmp/.zshrpmXXXXXX`
         grep -v '^%{_bindir}/zsh$' %{_sysconfdir}/shells > $TmpFile
-        chown --reference %{_sysconfdir}/shells $TmpFile
-        chmod --reference %{_sysconfdir}/shells $TmpFile
-        mv -f $TmpFile %{_sysconfdir}/shells
+        cp -f $TmpFile %{_sysconfdir}/shells
+        rm -f $TmpFile
     fi
 fi
 
@@ -134,7 +134,7 @@ fi
 %{_infodir}/*
 %{_datadir}/zsh
 %{_libdir}/zsh
-%config(noreplace) %{_sysconfdir}/skel/.*
+%config(noreplace) %{_sysconfdir}/skel/.z*
 %config(noreplace) %{_sysconfdir}/z*
 
 %files html
@@ -142,6 +142,13 @@ fi
 %doc Doc/zsh/*.html
 
 %changelog
+* 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.
+Resolves: rhbz#226813
+
 * Tue Feb 27 2007 James Antill <james@and.org> - 4.2.6-4
 - Fix buildroot to new Fedora default.
 - Remove /etc/skel from ownership.