From 21be858e7a91bc7c9957cf765f14b9b92f95dad5 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 15:21:07 +0000 Subject: [PATCH] auto-import changelog data from zsh-4.0.9-1.src.rpm Tue Jan 13 2004 Jens Petersen - 4.0.9-1 - update to 4.0.9 release - zsh-4.0.7-completion-_files-110852.patch no longer needed - update zsh-4.0.7-bckgrnd-bld-102042.patch to better one with --with-tcsetpgrp configure option by Philippe Troin - configure --with-tcsetpgrp - buildrequire texinfo for makeinfo - fix ownership of html manual (112749) [Florian La Roche] Tue Dec 09 2003 Jens Petersen - 4.0.7-3 - no longer "stty erase" in /etc/zshrc for screen [Lon Hohberger] Thu Nov 27 2003 Jens Petersen - 4.0.7-2 - quote % in file glob'ing completion code (#110852) [reported with patch by Keith T. Garner] - add zsh-4.0.7-bckgrnd-bld-102042.patch from Philippe Troin to allow configure to run in the background (#102042) [reported by Michael Redinger] - above patch requires autoconf to be run - include html manual in separate -html subpackage - changed url to master site - skip completion tests on ppc and ppc64 for now, since they hang --- .cvsignore | 2 +- sources | 2 +- zsh.spec | 63 ++++++++++++++++++++++++++++++++++++++++++++++-------- zshrc.rhs | 6 ------ 4 files changed, 56 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index 51f6bd7..8217a4f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zsh-4.0.7.tar.bz2 +zsh-4.0.9.tar.bz2 diff --git a/sources b/sources index 7ec4a87..4e553c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93a3a47b2419182408d5b31acd26528a zsh-4.0.7.tar.bz2 +26cc0f9051ba41063e950723246dfaa8 zsh-4.0.9.tar.bz2 diff --git a/zsh.spec b/zsh.spec index bca5cf8..32702e0 100644 --- a/zsh.spec +++ b/zsh.spec @@ -2,10 +2,10 @@ Summary: A shell similar to ksh, but with improvements. Name: zsh -Version: 4.0.7 -Release: 1.1 +Version: 4.0.9 +Release: 1 License: BSD -URL: http://www.zsh.org/ +URL: http://zsh.sunsite.dk/ Group: System Environment/Shells Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.bz2 Source1: zlogin.rhs @@ -16,10 +16,12 @@ Source5: zshenv.rhs Source6: dotzshrc Patch0: zsh-serial.patch Patch1: zsh-4.0.6-make-test-fail.patch +#Patch2: zsh-4.0.7-completion-_files-110852.patch +Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch Prereq: fileutils grep /sbin/install-info Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: libcap -BuildRequires: libtermcap-devel libcap-devel +BuildRequires: libtermcap-devel libcap-devel texinfo %{?_without_check: %define _without_check 1} %{!?_without_check: %define _without_check 0} @@ -32,29 +34,46 @@ command line editing, built-in spelling correction, programmable command completion, shell functions (with autoloading), a history mechanism, and more. +%package html +Summary: Zsh shell manual in html format +Group: System Environment/Shells + +%description html +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 (the Korn shell), but includes many enhancements. Zsh supports +command line editing, built-in spelling correction, programmable +command completion, shell functions (with autoloading), a history +mechanism, and more. + +This package contains the Zsh manual in html format. + %prep %setup -q %patch0 -p1 -b .serial %patch1 -p1 -b .fail +#%%patch2 -p1 -b .orig +%patch3 -p0 -b .bckgrnd +# patch3 touches zshconfig.ac +autoconf %build %define _bindir /bin -#autoconf # Avoid stripping... export LDFLAGS="" -%configure --enable-etcdir=%{_sysconfdir} +%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp -make +make all html # Run the testsuite %if ! %{_without_check} # the completion tests hang on s390 and s390x -%ifarch s390 s390x +%ifarch s390 s390x ppc ppc64 ( cd Test mkdir skipped mv Y*.ztst skipped ) %endif - make test + ZTST_verbose=0 make test %endif %install @@ -115,7 +134,33 @@ fi %{_libdir}/zsh %config(noreplace) %{_sysconfdir}/* +%files html +%defattr(-,root,root) +%doc Doc/*.html + %changelog +* Tue Jan 13 2004 Jens Petersen - 4.0.9-1 +- update to 4.0.9 release +- zsh-4.0.7-completion-_files-110852.patch no longer needed +- update zsh-4.0.7-bckgrnd-bld-102042.patch to better one with --with-tcsetpgrp + configure option by Philippe Troin +- configure --with-tcsetpgrp +- buildrequire texinfo for makeinfo +- fix ownership of html manual (112749) [Florian La Roche] + +* Tue Dec 9 2003 Jens Petersen - 4.0.7-3 +- no longer "stty erase" in /etc/zshrc for screen [Lon Hohberger] + +* Thu Nov 27 2003 Jens Petersen - 4.0.7-2 +- quote %% in file glob'ing completion code (#110852) + [reported with patch by Keith T. Garner] +- add zsh-4.0.7-bckgrnd-bld-102042.patch from Philippe Troin to allow + configure to run in the background (#102042) [reported by Michael Redinger] +- above patch requires autoconf to be run +- include html manual in separate -html subpackage +- changed url to master site +- skip completion tests on ppc and ppc64 for now, since they hang + * Fri Jun 20 2003 Jens Petersen - 4.0.7-1 - update to 4.0.7 bugfix release diff --git a/zshrc.rhs b/zshrc.rhs index 1508b89..0a6361b 100644 --- a/zshrc.rhs +++ b/zshrc.rhs @@ -14,9 +14,3 @@ PROMPT='[%n@%m]%~%# ' # default prompt # bindkey -v # vi key bindings # bindkey -e # emacs key bindings bindkey ' ' magic-space # also do history expansion on space - -# setup backspace correctly -if [ -x /usr/bin/tput ]; then - # check we're not in a dumb terminal - [ -n "`tput kbs 2>/dev/null`" ] && stty erase `tput kbs` -fi