diff --git a/zsh-4.3.2-doc.tar.bz2 b/zsh-4.3.2-doc.tar.bz2 deleted file mode 100644 index fd638c9..0000000 --- a/zsh-4.3.2-doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f -size 2207375 diff --git a/zsh-4.3.2.tar.bz2 b/zsh-4.3.2.tar.bz2 deleted file mode 100644 index 82d435a..0000000 --- a/zsh-4.3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3 -size 2263544 diff --git a/zsh-4.3.4-doc.tar.bz2 b/zsh-4.3.4-doc.tar.bz2 new file mode 100644 index 0000000..04f0d31 --- /dev/null +++ b/zsh-4.3.4-doc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777 +size 2358063 diff --git a/zsh-4.3.1.diff b/zsh-4.3.4.diff similarity index 91% rename from zsh-4.3.1.diff rename to zsh-4.3.4.diff index 100728f..3a3e527 100644 --- a/zsh-4.3.1.diff +++ b/zsh-4.3.4.diff @@ -1,7 +1,7 @@ Index: Doc/Makefile.in.orig =================================================================== ---- /dev/null -+++ Doc/Makefile.in.orig +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ Doc/Makefile.in.orig 2007-04-19 18:28:22.143584630 +0200 @@ -0,0 +1,351 @@ +# +# Makefile for Doc subdirectory @@ -356,14 +356,11 @@ Index: Doc/Makefile.in.orig +@CONFIG_MK@ Index: Doc/Makefile.in =================================================================== ---- Doc/Makefile.in.orig -+++ Doc/Makefile.in -@@ -276,28 +276,11 @@ install.man: man - .PHONY: install.man - +--- Doc/Makefile.in.orig 2006-12-17 17:02:02.000000000 +0100 ++++ Doc/Makefile.in 2007-04-19 18:29:43.692468133 +0200 +@@ -285,26 +285,9 @@ install.man: man # install info pages, creating install directory if necessary --install.info: texi -+install.info: info + install.info: texi ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) - rm -rf infodir - mkdir infodir @@ -372,12 +369,12 @@ Index: Doc/Makefile.in - < $(sdir)/zsh.texi > infodir/tzsh.texi && \ - (cd infodir && $(MAKEINFO) tzsh.texi) && \ - for file in infodir/$(tzsh).info*; do \ -+ for file in zsh.info*; do \ ++ for file in zsh.info*; do \ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \ - done \ - ); then \ - if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -- install-info --dir-file=$(DESTDIR)$(infodir)/dir \ +- install-info --info-dir=$(DESTDIR)$(infodir) \ - $(DESTDIR)$(infodir)/$(tzsh).info; \ - else true; fi; \ - rm -rf infodir; \ @@ -386,11 +383,11 @@ Index: Doc/Makefile.in - rm -rf infodir; \ - exit 1; \ - fi -+ done ++ done .PHONY: install.info # uninstall man pages -@@ -316,7 +299,7 @@ uninstall.info: +@@ -323,7 +306,7 @@ uninstall.info: # install HTML manual install.html: html ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) @@ -401,8 +398,8 @@ Index: Doc/Makefile.in .PHONY: install.html Index: Doc/intro.ms =================================================================== ---- Doc/intro.ms.orig -+++ Doc/intro.ms +--- Doc/intro.ms.orig 1999-08-01 16:48:54.000000000 +0200 ++++ Doc/intro.ms 2007-04-19 18:28:22.179586786 +0200 @@ -336,7 +336,7 @@ functions. For example: >\0\0\0\0\0\0\0ypmatch\0$1\0passwd.byname >\0} @@ -525,8 +522,8 @@ Index: Doc/intro.ms .Ds Index: Functions/Misc/checkmail =================================================================== ---- Functions/Misc/checkmail.orig -+++ Functions/Misc/checkmail +--- Functions/Misc/checkmail.orig 2006-09-15 20:22:19.000000000 +0200 ++++ Functions/Misc/checkmail 2007-04-19 18:28:22.183587025 +0200 @@ -1,4 +1,4 @@ -#! /usr/local/bin/zsh +#! /usr/bin/zsh @@ -535,8 +532,8 @@ Index: Functions/Misc/checkmail # for new mails. The arguments are interpreted in exactly the same way Index: Functions/Misc/run-help =================================================================== ---- Functions/Misc/run-help.orig -+++ Functions/Misc/run-help +--- Functions/Misc/run-help.orig 2006-10-15 19:30:13.000000000 +0200 ++++ Functions/Misc/run-help 2007-04-19 18:28:22.231589900 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh +#!/usr/bin/zsh @@ -574,7 +571,7 @@ Index: Functions/Misc/run-help return $? fi -@@ -58,7 +60,7 @@ do +@@ -61,7 +63,7 @@ do case ${what[(w)1]} in (comp*) man zshcompsys;; (zf*) man zshftpsys;; @@ -585,8 +582,8 @@ Index: Functions/Misc/run-help case ${what[(w)1]} in Index: Misc/globtests =================================================================== ---- Misc/globtests.orig -+++ Misc/globtests +--- Misc/globtests.orig 2006-07-25 20:10:38.000000000 +0200 ++++ Misc/globtests 2007-04-19 18:28:22.275592535 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh -f +#!/usr/bin/zsh -f @@ -595,8 +592,8 @@ Index: Misc/globtests unsetopt kshglob Index: Misc/globtests.ksh =================================================================== ---- Misc/globtests.ksh.orig -+++ Misc/globtests.ksh +--- Misc/globtests.ksh.orig 1999-04-25 17:43:59.000000000 +0200 ++++ Misc/globtests.ksh 2007-04-19 18:28:22.311594691 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh -f +#!/usr/bin/zsh -f @@ -605,8 +602,8 @@ Index: Misc/globtests.ksh Index: Misc/lete2ctl =================================================================== ---- Misc/lete2ctl.orig -+++ Misc/lete2ctl +--- Misc/lete2ctl.orig 1999-04-15 20:10:27.000000000 +0200 ++++ Misc/lete2ctl 2007-04-19 18:28:22.323595410 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w @@ -615,8 +612,8 @@ Index: Misc/lete2ctl # thee User may with thee merest Presse of thee Tabbe-Keye expande Index: Src/Makefile.in =================================================================== ---- Src/Makefile.in.orig -+++ Src/Makefile.in +--- Src/Makefile.in.orig 2005-07-24 06:47:57.000000000 +0200 ++++ Src/Makefile.in 2007-04-19 18:28:22.339596368 +0200 @@ -148,14 +148,7 @@ uninstall.bin: uninstall.bin-here # install binary, creating install directory if necessary install.bin-here: zsh$(EXEEXT) $(INSTLIB) @@ -635,8 +632,8 @@ Index: Src/Makefile.in install.bin-N: Index: Src/Modules/terminfo.c =================================================================== ---- Src/Modules/terminfo.c.orig -+++ Src/Modules/terminfo.c +--- Src/Modules/terminfo.c.orig 2006-05-31 00:35:03.000000000 +0200 ++++ Src/Modules/terminfo.c 2007-04-19 18:28:22.379598764 +0200 @@ -28,6 +28,7 @@ */ @@ -647,9 +644,9 @@ Index: Src/Modules/terminfo.c #if defined(HAVE_TIGETFLAG) && defined(HAVE_CURSES_H) Index: Src/init.c =================================================================== ---- Src/init.c.orig -+++ Src/init.c -@@ -717,7 +717,7 @@ setupvals(void) +--- Src/init.c.orig 2007-01-30 19:42:55.000000000 +0100 ++++ Src/init.c 2007-04-19 18:28:22.431601878 +0200 +@@ -730,7 +730,7 @@ setupvals(void) path = (char **) zalloc(sizeof(*path) * 5); path[0] = ztrdup("/bin"); path[1] = ztrdup("/usr/bin"); @@ -660,8 +657,8 @@ Index: Src/init.c Index: Test/ztst.zsh =================================================================== ---- Test/ztst.zsh.orig -+++ Test/ztst.zsh +--- Test/ztst.zsh.orig 2006-11-28 23:09:00.000000000 +0100 ++++ Test/ztst.zsh 2007-04-19 18:28:22.459603555 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh -f +#!/usr/bin/zsh -f @@ -670,8 +667,8 @@ Index: Test/ztst.zsh # must already have been installed in that case. Index: Util/check_exports =================================================================== ---- Util/check_exports.orig -+++ Util/check_exports +--- Util/check_exports.orig 2004-03-12 19:56:48.000000000 +0100 ++++ Util/check_exports 2007-04-19 18:28:22.487605232 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w @@ -680,8 +677,8 @@ Index: Util/check_exports # a zsh build to see if all necessary symbols appear in the .export file Index: Util/helpfiles =================================================================== ---- Util/helpfiles.orig -+++ Util/helpfiles +--- Util/helpfiles.orig 2006-03-13 20:03:55.000000000 +0100 ++++ Util/helpfiles 2007-04-19 18:28:22.507606430 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -- -*-perl-*- +#!/usr/bin/perl -- -*-perl-*- @@ -690,8 +687,8 @@ Index: Util/helpfiles Index: Util/reporter =================================================================== ---- Util/reporter.orig -+++ Util/reporter +--- Util/reporter.orig 2000-09-02 23:17:41.000000000 +0200 ++++ Util/reporter 2007-04-19 18:28:22.535608107 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh +#!/usr/bin/zsh diff --git a/zsh-4.3.4.tar.bz2 b/zsh-4.3.4.tar.bz2 new file mode 100644 index 0000000..6158944 --- /dev/null +++ b/zsh-4.3.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fa0e22cb0da3a02c115425097002f2b4bb56e412db6c821ca111e088cbfdec6 +size 2374851 diff --git a/zsh.changes b/zsh.changes index 09b609e..459b0c2 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jul 4 16:14:30 CEST 2007 - hvogel@suse.de + +- update to version 4.3.4 + * various bugfixes + * countless completion fixes + * some new completions + * various UTF8 fixes +- remove autoresume option from default config [#287776] + ------------------------------------------------------------------- Fri Mar 30 12:33:28 CEST 2007 - rguenther@suse.de diff --git a/zsh.spec b/zsh.spec index 3ab998c..10e3140 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,5 +1,5 @@ # -# spec file for package zsh (Version 4.3.2) +# spec file for package zsh (Version 4.3.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,8 +11,8 @@ # norootforbuild Name: zsh -Version: 4.3.2 -Release: 42 +Version: 4.3.4 +Release: 1 License: Other uncritical OpenSource License Group: System/Shells BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,7 +34,7 @@ Source5: _hwinfo Source6: _make # unused atm. we build the docs with yodl on our own. Source20: %{name}-%{version}-doc.tar.bz2 -Patch0: %{name}-4.3.1.diff +Patch0: %{name}-4.3.4.diff Patch1: %{name}-4.2.5-tailsyntax.diff Patch2: %{name}-4.3.1-91.diff Summary: Shell with comprehensive completion @@ -54,10 +54,12 @@ Authors: Paul Falstad %prep -%setup +%setup -q %patch0 %patch1 %patch2 +perl -p -i -e 's|/usr/local/bin/zsh|%{_bindir}/zsh|' \ + Functions/Misc/zcalc Functions/Example/cat %build export CC="gcc" CFLAGS="%{optflags} -pipe -fno-strict-aliasing" @@ -140,6 +142,13 @@ groff Doc/intro.ms > intro.txt %{_mandir}/man1/zsh*.1.gz %changelog +* Wed Jul 04 2007 - hvogel@suse.de +- update to version 4.3.4 + * various bugfixes + * countless completion fixes + * some new completions + * various UTF8 fixes +- remove autoresume option from default config [#287776] * Fri Mar 30 2007 - rguenther@suse.de - add ncurses-devel BuildRequires. * Fri Jul 14 2006 - mskibbe@suse.de diff --git a/zshrc b/zshrc index e926d3b..2ccc9e7 100644 --- a/zshrc +++ b/zshrc @@ -20,7 +20,7 @@ SAVEHIST=500 # Set/unset shell options setopt globdots nocorrect pushdtohome autolist nopromptcr -setopt nocorrectall autocd recexact longlistjobs autoresume +setopt nocorrectall autocd recexact longlistjobs setopt histignoredups pushdsilent appendhistory histexpiredupsfirst setopt autopushd pushdminus extendedglob rcquotes unsetopt bgnice autoparamslash hup