rpms/zsh/devel zsh.spec,1.30,1.31
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Feb 27 22:20:16 UTC 2007
Author: jantill
Update of /cvs/dist/rpms/zsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv397
Modified Files:
zsh.spec
Log Message:
* Tue Feb 27 2007 James Antill <james at 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
Index: zsh.spec
===================================================================
RCS file: /cvs/dist/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- zsh.spec 16 Jan 2007 19:11:08 -0000 1.30
+++ zsh.spec 27 Feb 2007 22:20:14 -0000 1.31
@@ -3,7 +3,7 @@
Summary: A powerful interactive shell
Name: zsh
Version: 4.2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
URL: http://zsh.sunsite.dk/
Group: System Environment/Shells
@@ -19,13 +19,9 @@
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: %{_tmppath}/%{name}-%{version}-root
-Requires: libcap
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: ncurses-devel libcap-devel texinfo tetex texi2html
-%{?_without_check: %define _without_check 1}
-%{!?_without_check: %define _without_check 0}
-
%description
The zsh shell is a command interpreter usable as an interactive login
shell and as a shell script command processor. Zsh resembles the ksh
@@ -66,8 +62,9 @@
%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support
make all html
+
+%check
# Run the testsuite
-%if ! %{_without_check}
# the completion tests hang on s390 and s390x
%ifarch s390 s390x ppc ppc64
( cd Test
@@ -75,25 +72,27 @@
mv Y*.ztst skipped )
%endif
ZTST_verbose=0 make test
-%endif
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall install.info \
- fndir=$RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions \
- sitefndir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
+ fndir=$RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions \
+ sitefndir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
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
+ install -m 644 $RPM_SOURCE_DIR/${i}.rhs ${RPM_BUILD_ROOT}%{_sysconfdir}/$i
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!' \
+ ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/*
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -105,24 +104,24 @@
fi
/sbin/install-info %{_infodir}/zsh.info.gz %{_infodir}/dir \
- --entry="* zsh: (zsh). An enhanced bourne shell."
+ --entry="* zsh: (zsh). An enhanced bourne shell."
:
%preun
if [ "$1" = 0 ] ; then
/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
:
%postun
if [ "$1" = 0 ] ; then
if [ -f %{_sysconfdir}/shells ] ; then
- TmpFile=`%{_bindir}/mktemp /tmp/.zshrpmXXXXXX`
- grep -v '^%{_bindir}/zsh$' %{_sysconfdir}/shells > $TmpFile
- cp -f $TmpFile %{_sysconfdir}/shells
- rm -f $TmpFile
- chmod 644 %{_sysconfdir}/shells
+ 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
fi
fi
@@ -135,13 +134,22 @@
%{_infodir}/*
%{_datadir}/zsh
%{_libdir}/zsh
-%config(noreplace) %{_sysconfdir}/*
+%config(noreplace) %{_sysconfdir}/skel/.*
+%config(noreplace) %{_sysconfdir}/z*
%files html
%defattr(-,root,root)
%doc Doc/zsh/*.html
%changelog
+* Tue Feb 27 2007 James Antill <james at 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 at redhat.com> - 4.2.6-3
- Link with ncurses
- Add dist tag
@@ -160,7 +168,7 @@
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.5-1.2.2
- bump again for double-long bug on ppc(64)
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - %{version}-%{release}
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.5
- rebuilt for new gcc4.1 snapshot and glibc changes
* Wed Jan 4 2006 Jesse Keating <jkeating at redhat.com> 0 4.2.5-1.2
@@ -253,7 +261,7 @@
* Fri Nov 29 2002 Florian La Roche <Florian.LaRoche at redhat.de> 4.0.6-2
- 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 at redhat.com> 4.0.6-1
- define _bindir to be /bin and use it
More information about the fedora-cvs-commits
mailing list