- Fix buildroot to new Fedora default.

- Remove /etc/skel from ownership.
- Remove explicit libcap dep.
- Tweak postun script.
- Move checking to generic rpm infrastructure. Resolves: rhbz#226813
This commit is contained in:
jantill 2007-02-27 22:20:14 +00:00
parent 4cff864b37
commit dd07451748

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: 3%{?dist} Release: 4%{?dist}
License: BSD License: BSD
URL: http://zsh.sunsite.dk/ URL: http://zsh.sunsite.dk/
Group: System Environment/Shells Group: System Environment/Shells
@ -19,13 +19,9 @@ 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 #Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch
Prereq: fileutils grep /sbin/install-info Prereq: fileutils grep /sbin/install-info
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: libcap
BuildRequires: ncurses-devel libcap-devel texinfo tetex texi2html BuildRequires: ncurses-devel libcap-devel texinfo tetex texi2html
%{?_without_check: %define _without_check 1}
%{!?_without_check: %define _without_check 0}
%description %description
The zsh shell is a command interpreter usable as an interactive login The zsh shell is a command interpreter usable as an interactive login
shell and as a shell script command processor. Zsh resembles the ksh shell and as a shell script command processor. Zsh resembles the ksh
@ -66,8 +62,9 @@ export LDFLAGS=""
%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support %configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support
make all html make all html
%check
# Run the testsuite # Run the testsuite
%if ! %{_without_check}
# the completion tests hang on s390 and s390x # the completion tests hang on s390 and s390x
%ifarch s390 s390x ppc ppc64 %ifarch s390 s390x ppc ppc64
( cd Test ( cd Test
@ -75,25 +72,27 @@ make all html
mv Y*.ztst skipped ) mv Y*.ztst skipped )
%endif %endif
ZTST_verbose=0 make test ZTST_verbose=0 make test
%endif
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%makeinstall install.info \ %makeinstall install.info \
fndir=$RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions \ fndir=$RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions \
sitefndir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions sitefndir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
rm -f ${RPM_BUILD_ROOT}%{_bindir}/zsh-%{version} rm -f ${RPM_BUILD_ROOT}%{_bindir}/zsh-%{version}
rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir} mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
for i in zshrc zlogin zlogout zshenv zprofile; do for i in zshrc zlogin zlogout zshenv zprofile; do
install -m 644 $RPM_SOURCE_DIR/${i}.rhs ${RPM_BUILD_ROOT}%{_sysconfdir}/$i install -m 644 $RPM_SOURCE_DIR/${i}.rhs ${RPM_BUILD_ROOT}%{_sysconfdir}/$i
done 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!' \
${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/*
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -105,24 +104,24 @@ else
fi fi
/sbin/install-info %{_infodir}/zsh.info.gz %{_infodir}/dir \ /sbin/install-info %{_infodir}/zsh.info.gz %{_infodir}/dir \
--entry="* zsh: (zsh). An enhanced bourne shell." --entry="* zsh: (zsh). An enhanced bourne shell."
: :
%preun %preun
if [ "$1" = 0 ] ; then if [ "$1" = 0 ] ; then
/sbin/install-info --delete %{_infodir}/zsh.info.gz %{_infodir}/dir \ /sbin/install-info --delete %{_infodir}/zsh.info.gz %{_infodir}/dir \
--entry="* zsh: (zsh). An enhanced bourne shell." --entry="* zsh: (zsh). An enhanced bourne shell."
fi fi
: :
%postun %postun
if [ "$1" = 0 ] ; then 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
cp -f $TmpFile %{_sysconfdir}/shells chown --reference %{_sysconfdir}/shells $TmpFile
rm -f $TmpFile chmod --reference %{_sysconfdir}/shells $TmpFile
chmod 644 %{_sysconfdir}/shells mv -f $TmpFile %{_sysconfdir}/shells
fi fi
fi fi
@ -135,13 +134,22 @@ fi
%{_infodir}/* %{_infodir}/*
%{_datadir}/zsh %{_datadir}/zsh
%{_libdir}/zsh %{_libdir}/zsh
%config(noreplace) %{_sysconfdir}/* %config(noreplace) %{_sysconfdir}/skel/.*
%config(noreplace) %{_sysconfdir}/z*
%files html %files html
%defattr(-,root,root) %defattr(-,root,root)
%doc Doc/zsh/*.html %doc Doc/zsh/*.html
%changelog %changelog
* Tue Feb 27 2007 James Antill <james@and.org> - 4.2.6-4
- Fix buildroot to new Fedora default.
- Remove /etc/skel from ownership.
- Remove explicit libcap dep.
- Tweak postun script.
- Move checking to generic rpm infrastructure.
Resolves: rhbz#226813
* Tue Jan 16 2007 Miroslav Lichvar <mlichvar@redhat.com> - 4.2.6-3 * Tue Jan 16 2007 Miroslav Lichvar <mlichvar@redhat.com> - 4.2.6-3
- Link with ncurses - Link with ncurses
- Add dist tag - Add dist tag
@ -160,7 +168,7 @@ fi
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 4.2.5-1.2.2 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 4.2.5-1.2.2
- bump again for double-long bug on ppc(64) - bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - %{version}-%{release} * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 4.2.5
- rebuilt for new gcc4.1 snapshot and glibc changes - rebuilt for new gcc4.1 snapshot and glibc changes
* Wed Jan 4 2006 Jesse Keating <jkeating@redhat.com> 0 4.2.5-1.2 * Wed Jan 4 2006 Jesse Keating <jkeating@redhat.com> 0 4.2.5-1.2
@ -253,7 +261,7 @@ fi
* Fri Nov 29 2002 Florian La Roche <Florian.LaRoche@redhat.de> 4.0.6-2 * Fri Nov 29 2002 Florian La Roche <Florian.LaRoche@redhat.de> 4.0.6-2
- make sure /bin/zsh is owned by root and not bhcompile - make sure /bin/zsh is owned by root and not bhcompile
- do not package zsh-%{version} into binary rpm - do not package zsh-%%{version} into binary rpm
* Thu Nov 28 2002 Jens Petersen <petersen@redhat.com> 4.0.6-1 * Thu Nov 28 2002 Jens Petersen <petersen@redhat.com> 4.0.6-1
- define _bindir to be /bin and use it - define _bindir to be /bin and use it