rpms/zsh
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fix sed typo.

Browse Source 
- Fix skel expansion problem.
- Add Requires for mktemp/info/etc.
- Use cp again due to SELinux context. Resolves: rhbz#226813
This commit is contained in:
jantill 2007-02-28 03:46:10 +00:00
parent dd07451748
commit 41d85bb551
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zsh.spec
View File

@ -3,7 +3,7 @@
Summary: A powerful interactive shell Summary: A powerful interactive shell
Name: zsh Name: zsh
Version: 4.2.6 Version: 4.2.6
Release: 4%{?dist} Release: 5%{?dist}
License: BSD License: BSD
URL: http://zsh.sunsite.dk/ URL: http://zsh.sunsite.dk/
Group: System Environment/Shells 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 #Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch
Prereq: fileutils grep /sbin/install-info Prereq: fileutils grep /sbin/install-info
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: mktemp coreutils grep info
BuildRequires: ncurses-devel libcap-devel texinfo tetex texi2html BuildRequires: ncurses-devel libcap-devel texinfo tetex texi2html
%description %description
@ -90,7 +91,7 @@ done
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/skel mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/skel
install -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/skel/.zshrc 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/* ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/*
%clean %clean
@ -119,9 +120,8 @@ if [ "$1" = 0 ] ; then
if [ -f %{_sysconfdir}/shells ] ; then if [ -f %{_sysconfdir}/shells ] ; then
TmpFile=`%{_bindir}/mktemp /tmp/.zshrpmXXXXXX` TmpFile=`%{_bindir}/mktemp /tmp/.zshrpmXXXXXX`
grep -v '^%{_bindir}/zsh$' %{_sysconfdir}/shells > $TmpFile grep -v '^%{_bindir}/zsh$' %{_sysconfdir}/shells > $TmpFile
chown --reference %{_sysconfdir}/shells $TmpFile cp -f $TmpFile %{_sysconfdir}/shells
chmod --reference %{_sysconfdir}/shells $TmpFile rm -f $TmpFile
mv -f $TmpFile %{_sysconfdir}/shells
fi fi
fi fi
@ -134,7 +134,7 @@ fi
%{_infodir}/* %{_infodir}/*
%{_datadir}/zsh %{_datadir}/zsh
%{_libdir}/zsh %{_libdir}/zsh
%config(noreplace) %{_sysconfdir}/skel/.* %config(noreplace) %{_sysconfdir}/skel/.z*
%config(noreplace) %{_sysconfdir}/z* %config(noreplace) %{_sysconfdir}/z*
%files html %files html
@ -142,6 +142,13 @@ fi
%doc Doc/zsh/*.html %doc Doc/zsh/*.html
%changelog %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 * Tue Feb 27 2007 James Antill <james@and.org> - 4.2.6-4
- Fix buildroot to new Fedora default. - Fix buildroot to new Fedora default.
- Remove /etc/skel from ownership. - Remove /etc/skel from ownership.