pool/zsh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 18109 from shells

Browse Source 
Copy from shells/zsh based on submit request 18109 from user hennevogel

OBS-URL: https://build.opensuse.org/request/show/18109
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zsh?expand=0&rev=12
This commit is contained in:
OBS User autobuild 2009-08-18 22:11:24 +00:00 committed by Git OBS Bridge
parent 2ab1b36efb
commit 81b5c7e539
15 changed files with 218 additions and 516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zsh-4.2.5-tailsyntax.diff
View File

@ -1,13 +0,0 @@
Index: Test/E01options.ztst
===================================================================
--- Test/E01options.ztst.orig
+++ Test/E01options.ztst
@@ -116,7 +116,7 @@
>scalar
# Count the number of directories on the stack. Don't care what they are.
- dircount() { dirs -v | tail -1 | awk '{ print $1 + 1}'; }
+ dircount() { dirs -v | tail -n 1 | awk '{ print $1 + 1}'; }
unsetopt autopushd
cd tmpcd
dircount

13
zsh-4.3.1-91.diff
View File

@ -1,13 +0,0 @@
Index: Doc/Makefile.in
===================================================================
--- Doc/Makefile.in.orig
+++ Doc/Makefile.in
@@ -40,7 +40,7 @@ INSTALL = @INSTALL@
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
DVIPS = dvips
-TEXI2HTML = texi2html --output . --ifinfo --split=chapter
+TEXI2HTML = texi2html --output . --split=chapter
.SUFFIXES: .yo .1

3
zsh-4.3.10-doc.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f53d5c434fdb26fc79755279175514507eb1d11cf793ac57270d053ee61f37f9
size 2690183

50
zsh-4.3.10-doc_intro_paths.patch Normal file
View File

@ -0,0 +1,50 @@
--- Doc/intro.ms
+++ Doc/intro.ms
@@ -516,13 +516,13 @@
%\0ed\0/tmp/funs/yp
25
i
-#!\0/usr/local/bin/zsh
+#!\0/usr/bin/zsh
.
w
42
q
%\0</tmp/funs/yp
-#!\0/usr/local/bin/zsh
+#!\0/usr/bin/zsh
ypmatch\0$1\0passwd.byname
%\0/tmp/funs/yp\0sukthnkr
sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/bin/bin/tcsh
@@ -1153,7 +1153,7 @@
There are several ways to manipulate history in \fBzsh\fP.
One way is to use csh-style \fC!\fP history:
.Ds
-%\0/usr/local/bin/!:0\0!-2*:s/foo/bar/\0>>!$
+%\0/usr/bin/!:0\0!-2*:s/foo/bar/\0>>!$
.De
If you don't want to use this, you can turn it off
by typing \fCsetopt nobanghist\fP. If you are afraid of accidentally
@@ -1191,9 +1191,9 @@
In this example, no event designator was used, which tells \fBzsh\fP
to use the previous command. A \fC$\fP specifies the last argument
.Ds
-%\0mkdir\0/usr/local/lib/emacs/site-lisp/calc
+%\0mkdir\0/usr/share/emacs/site-lisp/calc
%\0cd\0!:$
-cd\0/usr/local/lib/emacs/site-lisp/calc
+cd\0/usr/share/emacs/site-lisp/calc
.De
If you use more words of the same command, only the first \fC!\fP
needs an event designator.
--- Test/E01options.ztst
+++ Test/E01options.ztst
@@ -116,7 +116,7 @@
>scalar
# Count the number of directories on the stack. Don't care what they are.
- dircount() { dirs -v | tail -1 | awk '{ print $1 + 1}'; }
+ dircount() { dirs -v | tail -n 1 | awk '{ print $1 + 1}'; }
unsetopt autopushd
cd tmpcd
dircount

50
zsh-4.3.10-doc_makefile.patch Normal file
View File

@ -0,0 +1,50 @@
--- Doc/Makefile.in
+++ Doc/Makefile.in
@@ -40,7 +40,7 @@
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
DVIPS = dvips
-TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files
+TEXI2HTML = @TEXI2HTML@ --output . --split=chapter --node-files
.SUFFIXES: .yo .1
@@ -294,26 +294,9 @@
# install info pages, creating install directory if necessary
install.info: texi
${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir)
- rm -rf infodir
- mkdir infodir
- if ( \
- sed '/^@setfilename/s|zsh|$(tzsh)|' \
- < $(sdir)/zsh.texi > infodir/tzsh.texi && \
- (cd infodir && $(MAKEINFO) tzsh.texi) && \
- for file in infodir/$(tzsh).info*; do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \
- done \
- ); then \
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- install-info --info-dir=$(DESTDIR)$(infodir) \
- $(DESTDIR)$(infodir)/$(tzsh).info; \
- else true; fi; \
- rm -rf infodir; \
- exit 0; \
- else \
- rm -rf infodir; \
- exit 1; \
- fi
+ for file in zsh.info*; do \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \
+ done
.PHONY: install.info
# uninstall man pages
@@ -332,7 +315,7 @@
# install HTML manual
install.html: html
${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir)
- for file in *.html; do \
+ for file in zsh*.html; do \
$(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \
done
.PHONY: install.html

20
zsh-4.3.10-run-help_pager.patch Normal file
View File

@ -0,0 +1,20 @@
--- Functions/Misc/run-help
+++ Functions/Misc/run-help
@@ -30,7 +30,7 @@
return 0
elif [[ -n "${HELPDIR:-}" && -r $HELPDIR/$1 && $1 != compctl ]]
then
- ${=PAGER:-more} $HELPDIR/$1
+ ${=PAGER:-less -M} $HELPDIR/$1
return $?
fi
@@ -64,7 +64,7 @@
(comp*) man zshcompsys;;
(zf*) man zshftpsys;;
(run-help) man zshcontrib;;
- (*) builtin functions ${what[(w)1]} | ${=PAGER:-more};;
+ (*) builtin functions ${what[(w)1]} | ${=PAGER:-less -M};;
esac;;
(*( is a * builtin))
case ${what[(w)1]} in

3
zsh-4.3.10.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c
size 2735665

241
zsh-4.3.4.diff
View File

@ -1,241 +0,0 @@
Index: Doc/Makefile.in
===================================================================
--- 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
${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir)
- rm -rf infodir
- mkdir infodir
- if ( \
- sed '/^@setfilename/s|zsh|$(tzsh)|' \
- < $(sdir)/zsh.texi > infodir/tzsh.texi && \
- (cd infodir && $(MAKEINFO) tzsh.texi) && \
- for file in infodir/$(tzsh).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 --info-dir=$(DESTDIR)$(infodir) \
- $(DESTDIR)$(infodir)/$(tzsh).info; \
- else true; fi; \
- rm -rf infodir; \
- exit 0; \
- else \
- rm -rf infodir; \
- exit 1; \
- fi
+ done
.PHONY: install.info
# uninstall man pages
@@ -323,7 +306,7 @@ uninstall.info:
# install HTML manual
install.html: html
${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir)
- for file in zsh*.html; do \
+ for file in zsh/zsh*.html; do \
$(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \
done
.PHONY: install.html
Index: 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}
%\0yp\0pfalstad
-pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh
+pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh
.De
This function looks up a user in the NIS password map.
The \fC$1\fP expands to the first argument to \fCyp\fP.
@@ -356,7 +356,7 @@ parsed, not when the function is execute
.Ds
%\0alias\0ypmatch=echo
%\0yp\0pfalstad
-pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh
+pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh
.De
Since the alias was defined after the function was parsed, it has
no effect on the function's execution.
@@ -379,9 +379,9 @@ We can make the function take multiple a
>\0\0\0\0\0\0\0done
>\0}
%\0yp\0pfalstad\0subbarao\0sukthnkr
-pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh
-subbarao:*:3338:35:Kartik\0Subbarao:/u/subbarao:/usr/princeton/bin/zsh
-sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/princeton/bin/tcsh
+pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh
+subbarao:*:3338:35:Kartik\0Subbarao:/u/subbarao:/usr/bin/zsh
+sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/bin/tcsh
.De
The \fCfor i\fP loops through each of the function's arguments,
setting \fCi\fP equal to each of them in turn.
@@ -396,8 +396,8 @@ if no arguments are given:
%\0yp
usage:\0yp\0name\0...
%\0yp\0pfalstad\0sukthnkr
-pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh
-sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/princeton/bin/tcsh
+pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh
+sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/bin/tcsh
.De
\fC$#\fP is the number of arguments supplied to the function.
If it is equal to zero, we print a usage message; otherwise,
@@ -516,16 +516,16 @@ separate process is not created.)
%\0ed\0/tmp/funs/yp
25
i
-#!\0/usr/local/bin/zsh
+#!\0/usr/bin/zsh
.
w
42
q
%\0</tmp/funs/yp
-#!\0/usr/local/bin/zsh
+#!\0/usr/bin/zsh
ypmatch\0$1\0passwd.byname
%\0/tmp/funs/yp\0sukthnkr
-sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/princeton/bin/tcsh
+sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/bin/tcsh
.De
Now other people, who may not use \fBzsh\fP, or who don't want to
copy all of your \fC.zshrc\fP, may use these functions as shell
@@ -1068,13 +1068,13 @@ than \fCypmatch pfalstad passwd\fP:
.Ds
%\0alias\0-g\0PASS='<(ypcat\0passwd)'
%\0grep\0pfalstad\0PASS
-pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh
+pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh
.De
If you're really crazy, you can even call it \fC/etc/passwd\fP:
.Ds
%\0alias\0-g\0/etc/passwd='<(ypcat\0passwd)'
%\0grep\0pfalstad\0/etc/passwd
-pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh
+pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh
.De
The last example shows one of the perils of global aliases;
they have a lot of potential to cause confusion.
@@ -1153,7 +1153,7 @@ startup file, \fC.zshrc\fP.
There are several ways to manipulate history in \fBzsh\fP.
One way is to use csh-style \fC!\fP history:
.Ds
-%\0/usr/local/bin/!:0\0!-2*:s/foo/bar/\0>>!$
+%\0/usr/bin/!:0\0!-2*:s/foo/bar/\0>>!$
.De
If you don't want to use this, you can turn it off
by typing \fCsetopt nobanghist\fP. If you are afraid of accidentally
@@ -1191,9 +1191,9 @@ bar
In this example, no event designator was used, which tells \fBzsh\fP
to use the previous command. A \fC$\fP specifies the last argument
.Ds
-%\0mkdir\0/usr/local/lib/emacs/site-lisp/calc
+%\0mkdir\0/usr/share/emacs/site-lisp/calc
%\0cd\0!:$
-cd\0/usr/local/lib/emacs/site-lisp/calc
+cd\0/usr/share/emacs/site-lisp/calc
.De
If you use more words of the same command, only the first \fC!\fP
needs an event designator.
@@ -1474,7 +1474,7 @@ the \fCvared\fP command:
.Ds
%\0vared\0PATH
>\0/u/pfalstad/scr:/u/pfalstad/bin/sun4:/u/maruchck/scr:/u/subbarao/bin:/u/maruc
-hck/bin:/u/subbarao/scripts:/usr/princeton/bin:/usr/ucb:/usr/bin:/bin:/usr/host
+hck/bin:/u/subbarao/scripts:/usr/princeton/bin:/usr/bin/X11:/usr/bin:/bin:/usr/host
s:/usr/princeton/bin/X11:/./usr/lang:/./usr/etc:/./etc
.De
You can now edit the path. When you press return, the contents
@@ -2267,9 +2267,9 @@ changes \fBpath\fP as well, and vice ver
%\0PATH=/bin:/usr/bin:/tmp:.
%\0echo\0$path
/bin\0/usr/bin\0/tmp\0.
-%\0path=(\0/usr/bin\0.\0/usr/local/bin\0/usr/ucb\0)
+%\0path=(\0/usr/bin\0.\0/usr/local/bin\0/usr/bin/X11\0)
%\0echo\0$PATH
-/usr/bin:.:/usr/local/bin:/usr/ucb
+/usr/bin:.:/usr/local/bin:/usr/bin/X11
.De
The same is true of \fBCDPATH\fP and \fBcdpath\fP:
.Ds
Index: 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)
${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT)
- if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \
- rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \
- $(LN) $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).old; \
- else :; fi
- rm -f $(DESTDIR)$(bindir)/$(tzsh).new
- $(LN) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).new
- mv $(DESTDIR)$(bindir)/$(tzsh).new $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT)
+ $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh $(DESTDIR)$(bindir)/zsh
.PHONY: install.bin-here
install.bin-N:
Index: 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 @@
*/
#define USES_TERM_H 1
+#include <ncurses.h>
#include "terminfo.mdh"
#if defined(HAVE_TIGETFLAG) && defined(HAVE_CURSES_H)
Index: Src/init.c
===================================================================
--- 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");
- path[2] = ztrdup("/usr/ucb");
+ path[2] = ztrdup("/usr/bin/X11");
path[3] = ztrdup("/usr/local/bin");
path[4] = NULL;
Index: 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
# Attempt to scan executable, libraries, and .export files after
# a zsh build to see if all necessary symbols appear in the .export file
Index: 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-*-
# helpfiles: make help files for Z-shell builtins from the manual entries.
Index: 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
#
# NAME:
# reporter

3
zsh-4.3.6-doc.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a82cf4e55d6bcf1ea40c23ef5f99002d504c441a8f6d14af0ed4d574c6ffbcc6
size 2473544

3
zsh-4.3.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a253d107533ff60ab9edb74de9425f2ca93bc5a3ddb5c1b5bfd488a794dc873
size 2527972

28
zsh-cleanup.patch Normal file
View File

@ -0,0 +1,28 @@
--- Src/Makefile.in
+++ Src/Makefile.in
@@ -148,14 +148,7 @@
# install binary, creating install directory if necessary
install.bin-here: zsh$(EXEEXT) $(INSTLIB)
${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT)
- if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \
- rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \
- $(LN) $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).old; \
- else :; fi
- rm -f $(DESTDIR)$(bindir)/$(tzsh).new
- $(LN) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).new
- mv $(DESTDIR)$(bindir)/$(tzsh).new $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT)
+ $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh $(DESTDIR)$(bindir)/zsh
.PHONY: install.bin-here
install.bin-N:
--- Src/Modules/terminfo.c
+++ Src/Modules/terminfo.c
@@ -28,6 +28,7 @@
*/
#define USES_TERM_H 1
+#include <ncurses.h>
#include "terminfo.mdh"
#if defined(HAVE_TIGETFLAG) && defined(ZSH_HAVE_CURSES_H)

34
zsh.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Wed Aug 5 16:58:50 CEST 2009 - hvogel@suse.de
- update to version 4.3.10
o The command "emulate <mode> -c ..." evaluates an expression in
a given emulation.
o The variable CORRECT_IGNORE gives a pattern that can be ignored
in spelling correction.
o The option POSIX_ALIASES improves compatibility of aliases with
other shells.
o The option COMBINING_CHARS has been added. When it is set, the
line editor assumes the terminal is capable of displaying
zero-width combining characters (typically accents) correctly
as modifications to the base character, and will act accordingly.
o The option HIST_FCNTL_LOCK has been added to provide locking of
history files
o The syntax ~[...] provides a dynamic form of directory naming,
supplementing the existing static ~name syntax.
o Patterns can now be used in incremental searches with new widgets
o Highlighting and colouring of sections of the command line is now
supported
o Colouring of prompts is now supported within the shell by prompt
escapes.
o Various changes have been added to make debugging of shell code
easier
o The "fc" builtin has been enhanced to make non-interactive use
possible and output consistent when the history is manipulated
with "print -s".
o The completion style accept-exact-dirs has been added
o cd, chdir, pushd and popd now take a -q option to suppress side effects
- cleanup patches
- use fdupes
- install help files to versioned directory
-------------------------------------------------------------------
Fri Apr 24 14:15:13 CEST 2009 - hmacht@suse.de

263
zsh.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package zsh (Version 4.3.6)
# spec file for package zsh (Version 4.3.10)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,14 +19,15 @@
Name: zsh
Version: 4.3.6
Release: 68
License: BSD 3-Clause
Version: 4.3.10
Release: 1
License: Other uncritical OpenSource License
Group: System/Shells
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ncurses-devel
BuildRequires: libcap-devel
BuildRequires: yodl
BuildRequires: fdupes
PreReq: %{install_info_prereq}
Url: http://www.zsh.org
Source0: %{name}-%{version}.tar.bz2
@ -41,9 +42,10 @@ Source8: _osc
Source9: _zypper
# unused atm. we build the docs with yodl on our own.
Source20: %{name}-%{version}-doc.tar.bz2
Patch0: %{name}-4.3.4.diff
Patch1: %{name}-4.2.5-tailsyntax.diff
Patch2: %{name}-4.3.1-91.diff
Patch0: %{name}-%{version}-doc_makefile.patch
Patch1: %{name}-%{version}-doc_intro_paths.patch
Patch2: %{name}-%{version}-run-help_pager.patch
Patch3: zsh-cleanup.patch
Summary: Shell with comprehensive completion
%description
@ -54,8 +56,6 @@ behavior, file name globbing, features to make C-shell (csh) users feel
at home, and extra features drawn from tcsh (another `custom' shell).
Zsh is well known for its command line completion.
Authors:
--------
Paul Falstad
@ -65,8 +65,16 @@ Authors:
%patch0
%patch1
%patch2
perl -p -i -e 's|/usr/local/bin/zsh|%{_bindir}/zsh|' \
Functions/Misc/zcalc Functions/Example/cat
%patch3
# Fix bindir path in some files
perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \
Functions/Misc/zcalc Functions/Example/cat \
Functions/Misc/checkmail Functions/Misc/run-help Misc/globtests \
Misc/globtests.ksh Test/ztst.zsh Util/reporter Misc/lete2ctl \
Util/check_exports Util/helpfiles
# Get rid of /usr/princeton examples
perl -p -i -e 's|/usr/princeton|%{_bindir}|' \
Doc/intro.ms
%build
export CC="gcc" CFLAGS="%{optflags} -pipe -fno-strict-aliasing"
@ -85,19 +93,12 @@ export CC="gcc" CFLAGS="%{optflags} -pipe -fno-strict-aliasing"
make VERSION="%{version}" CFLAGS="$CFLAGS "%cflags_profile_generate \
DLCFLAGS="-fPIC -fno-profile-arcs" LDFLAGS="-fprofile-arcs"
# this is needed to create the profiling data files *.gcda
pushd Test
mkdir skipped
%ifarch s390 s390x ppc ppc64
mv D02glob.ztst skipped
%endif
mv A01grammar.ztst C02cond.ztst V01zmodload.ztst skipped
popd
ZTST_verbose=0 make test
make check
make clean
# compile with profiling data reading enabled and writing disabled
make VERSION="%{version}" CFLAGS="$CFLAGS "%cflags_profile_feedback \
DLCFLAGS="-fPIC -fno-branch-probabilities" LDFLAGS="-fprofile-arcs"
ZTST_verbose=0 make test
make check
make clean
%else
make VERSION="%{version}"
@ -109,7 +110,7 @@ mkdir -p Help
pushd Help/
troff -Tlatin1 -t -mandoc ../Doc/zshbuiltins.1 | \
grotty -cbou | \
sed -e 's/±/{+|-}/' | \
sed -e 's/±/{+|-}/' | \
../Util/helpfiles
popd
# generate intro.txt
@ -117,7 +118,6 @@ groff Doc/intro.ms > intro.txt
# better name for html documentation
%{__mkdir} Doc/htmldoc/
%{__mv} Doc/*.html Doc/htmldoc
%{__ln_s} zsh.html Doc/htmldoc/index.html
# remove some unwanted files in Etc/
%{__rm} -f Etc/Makefile* Etc/*.yo
@ -128,11 +128,12 @@ groff Doc/intro.ms > intro.txt
%{__install} -m 0644 %{S:1} %{S:2} %{S:7} %{buildroot}/etc
%{__install} -m 0644 %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{buildroot}%{_datadir}/%{name}/%version/functions
# install help files
%{__install} -m 0755 -Dd %{buildroot}%{_datadir}/%{name}/help
%{__install} -m 0644 Help/* %{buildroot}%{_datadir}/%{name}/help/
%{__install} -m 0755 -Dd %{buildroot}%{_datadir}/%{name}/%{version}/help
%{__install} -m 0644 Help/* %{buildroot}%{_datadir}/%{name}/%{version}/help/
# link zsh binary
%{__mv} %{buildroot}%{_bindir}/zsh %{buildroot}/bin/zsh
%{__ln_s} -f ../../bin/zsh %{buildroot}/usr/bin/zsh
%fdupes $RPM_BUILD_ROOT
%clean
%{__rm} -rf %{buildroot}
@ -157,217 +158,3 @@ groff Doc/intro.ms > intro.txt
%{_mandir}/man1/zsh*.1.gz
%changelog
* Fri Apr 24 2009 hmacht@suse.de
- add completion for osc (_osc)
- add completion for zypper (_zypper)
* Thu Oct 02 2008 hvogel@suse.de
- globally disabling the test was the plan, not only on some archs
* Thu Sep 18 2008 hvogel@suse.de
- disable another test globally which keeps hanging
* Tue Jun 17 2008 hvogel@suse.de
- disable one test globally
* Thu Apr 03 2008 hvogel@suse.de
- update to 4.3.6
* Various bugfixes
* various buildfixes
* for calendar_show use kdialog rather than xmessage if in KDE
* clarify the message printed when compaudit finds problems
* improve compsys option handling
* add -q option to cd, chdir, pushd, popd
* wait shouldn't return immediately on a signal unless it's
trapped
* fix not enough space for ztrftime string with multibyte
characters
* Tue Mar 25 2008 hvogel@suse.de
- Disable some tests on s390, s390x, ppc and ppc64
* Thu Mar 20 2008 hvogel@suse.de
- update to 4.3.5
* Various bugfixes
* stop tindent becoming negative, which causes infinite use of
memory; add debug test to see where it would become negative.
* make malloc(0) allocate a single byte instead of returning
invalid (and unfreeable) memory.
* fix race in POSIX signal blocking
* various completion fixes/updates, mostly git
* tidy up module interface and documentation
* more build tests
* The new extended globbing flag (#cN,M) behaves similarly to
the extended regular expression syntax {N,M}.
* The zsh/datetime module has been enhanced and a calendar function
system has been added along the lines of (but much enhanced from)
* A new module zsh/curses provides a builtin zcurses for access to
to the curses screen manipulation package.
* Mon Dec 03 2007 hvogel@suse.de
- cleanup initialization files
* Dont source profile from zshenv. profile is not for interactive
shells [#343621]
* Instead source profile from zprofile so we dont loose the features
and its easy to get rid of it.
* Source bash.bashrc from zshrc to keep the features and make it
possible to get rid of it easier.
* 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
- merged in patches from poeml (mruecker@suse.de)
- rediffed patches for -p0 (mruecker@suse.de)
- update to version 4.3.2 which (mruecker@suse.de)
o fix two minor build problems
o contains initial support for multibyte characters in the shell's line editor
- only require libcap for build on 10.0 and older (mruecker@suse.de)
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Sat Jan 14 2006 schwab@suse.de
- Don't strip binaries.
* Mon Dec 05 2005 hvogel@suse.de
- clean up specfile
- document profiling builds
* Mon Dec 05 2005 mmj@suse.de
- Fix typo
* Mon Dec 05 2005 mmj@suse.de
- Update to 4.2.6
* Wed Apr 06 2005 mmj@suse.de
- Update to 4.2.5
* Tue Mar 15 2005 mmj@suse.de
- Fix Makefile completion by using the _make from an older zsh
version [#72875]
* Thu Feb 17 2005 poeml@suse.de
- update yast2 completion to also complete *.ycp files
* Thu Feb 03 2005 mmj@suse.de
- Update to 4.2.4
* Mon Jan 31 2005 ro@suse.de
- adapt to texi2html changes
* Wed Jan 26 2005 uli@suse.de
- run configure with --with-tcsetpgrp as suggested by the fail log
(fixes s390*)
* Sat Jan 15 2005 mmj@suse.de
- Update to zsh-4.2.3 which is a bugfix release not really affecting
us, but better keep up to date
* Wed Jan 12 2005 mmj@suse.de
- Update to zsh-4.2.2
* Mon Dec 20 2004 poeml@suse.de
- fix yast2 completion to work without /sbin in PATH [#49374]
- fix yast2 and SuSEconfig completion to not show files from
working directory
- update hwinfo completion
* Fri Aug 13 2004 mmj@suse.de
- Update to zsh-4.2.1
* Wed Jul 28 2004 ro@suse.de
- fix build of helpfiles after groff update
* Fri Mar 19 2004 mmj@suse.de
- Update to zsh-4.2.0 final release
* Mon Mar 08 2004 mmj@suse.de
- Update to zsh-4.2.0-pre-3
* Fri Feb 27 2004 mmj@suse.de
- Update to zsh-4.2.0-pre-1
* Fri Jan 16 2004 mmj@suse.de
- Use -fprofile-arcs when linking and -fno-strict-aliasing for
compiling.
- Fix tail syntax
* Sat Oct 18 2003 mmj@suse.de
- Fix neededforbuild
* Thu Oct 16 2003 mmj@suse.de
- Don't build as root
- Cleanup specfile
* Tue Oct 14 2003 jh@suse.de
- Fix profiling lockup. (we can not profile dl_closed modules yet)
* Thu Jun 19 2003 mmj@suse.de
- Update to 4.1.1
- Enable profiling
* Thu May 08 2003 mmj@suse.de
- And do it even better, thanks Andreas Schwab.
* Thu May 08 2003 mmj@suse.de
- Use a better way of unaliasing 'which'. Thanks Ingo Lameter.
* Thu Apr 24 2003 ro@suse.de
- fix install_info --delete call and move from preun to postun
* Mon Apr 07 2003 mmj@suse.de
- Only delete info entries when removing last version.
* Fri Feb 07 2003 mmj@suse.de
- Use %%install_info macro
- Clean up build root
* Thu Jan 09 2003 mmj@suse.de
- Set the important option 'nopromptcr' to not screw output.
* Mon Sep 16 2002 mmj@suse.de
- Use BuildRoot
* Fri Aug 16 2002 mmj@suse.de
- Move zsh binary to /bin [#17758]
- Use proper libdir
* Thu Aug 15 2002 poeml@suse.de
- update completion for _yast{,2} and add one for _hwinfo
* Wed Aug 14 2002 mmj@suse.de
- Update to 4.0.6 which was released this fast b/c a termcap /
terminfo fix was forgotten together with a fix for _mount.
* Mon Aug 12 2002 mmj@suse.de
- Update to 4.0.5 which includes a lot more completion, modules and
bugfixes.
* Tue Jun 04 2002 mmj@suse.de
- Added the html documentation from the ZSH team.
* Tue Apr 16 2002 mmj@suse.de
- Fix to own %%{_defaultdocdir}/zsh
* Mon Mar 11 2002 mmj@suse.de
- Comment out a completion that a lot of people find broken
* Fri Feb 22 2002 mmj@suse.de
- Added yast2 and SuSEconfig completion from poeml@
* Wed Feb 13 2002 stepan@suse.de
- remove .orig and .rej files from patch set.
* Wed Jan 30 2002 mmj@suse.de
- Moved /etc/zshrc and /etc/zshenv to this package. This is ok b/c
it is only specific zsh options.
* Thu Dec 13 2001 mmj@suse.de
- Fix broken symlink from help/man1 -> ../Doc
* Sat Oct 27 2001 mmj@suse.de
- Update to 4.0.4
* Thu Oct 25 2001 mmj@suse.de
- Update to 4.0.3
* Tue Jun 26 2001 mmj@suse.de
- Update to the newly released 4.0.2
* Sat Jun 02 2001 mmj@suse.de
- Updated to the new stable release, zsh-4.0.1
- Fixed build prob on beta-i386 and beta-ia64
* Tue May 08 2001 mfabian@suse.de
- bzip2 sources
* Sun Apr 15 2001 schwab@suse.de
- Fix missing declarations.
* Fri Apr 13 2001 mmj@suse.de
- Updated to 4.0.1-pre-3
* Wed Mar 14 2001 mmj@suse.de
- Updated to 4.0.1-pre-2
* Sun Feb 18 2001 mmj@suse.de
- Updated to 4.0.1-pre-1
* Fri Dec 15 2000 werner@suse.de
- Update to 3.1.9-dev-8
* Fri Oct 06 2000 kukuk@suse.de
- Change group tag
* Fri May 12 2000 schwab@suse.de
- Update config files.
- Move docs to %%{_defaultdocdir}.
* Thu Jan 27 2000 werner@suse.de
- New zsh version 3.1.6-dev-16
- Install html and info documentation
- Enable run-help help library
- Fix paths of perl and zsh scripts
- Enable command line history
- Enable command line complementation/correction
* Mon Dec 06 1999 schwab@suse.de
- Fix errors from makeinfo
* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Tue Nov 17 1998 bs@suse.de
- removed symlink /etc/zshrc -> profile (aaa_base contains a real zshrc now)
* Fri Oct 10 1997 florian@suse.de
- update to version 3.0.5
* Mon Jun 23 1997 florian@suse.de
- update to version 3.0.4
* Wed Jan 22 1997 florian@suse.de
- update to version 3.0.2
* Thu Jan 02 1997 florian@suse.de
- update to version 3.0.1
- added more documentation in binary package
* Thu Jan 02 1997 florian@suse.de
new version 3.0.0

6
zshenv
View File

@ -1 +1,5 @@
# set global options for all zsh shells here
# Source the /etc/profile - done here since we want it to be done as the first
# thing the zsh does.
setopt nonomatch
source /etc/profile
unsetopt nonomatch

4
zshrc
View File

@ -1,7 +1,3 @@
# read bash.bashrc first for some features we dont want
# to re-implement here
source /etc/bash.bashrc
# zsh line editing
: ${ZSHEDIT:="emacs"}
: ${TERM:=linux}