Hello community, here is the log from the commit of package zsh for openSUSE:Factory checked in at Wed Aug 19 00:11:17 CEST 2009. -------- --- zsh/zsh.changes 2009-04-24 14:15:42.000000000 +0200 +++ zsh/zsh.changes 2009-08-18 12:50:45.000000000 +0200 @@ -1,0 +2,34 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zsh-4.2.5-tailsyntax.diff zsh-4.3.1-91.diff zsh-4.3.4.diff zsh-4.3.6-doc.tar.bz2 zsh-4.3.6.tar.bz2 New: ---- zsh-4.3.10-doc.tar.bz2 zsh-4.3.10-doc_intro_paths.patch zsh-4.3.10-doc_makefile.patch zsh-4.3.10-run-help_pager.patch zsh-4.3.10.tar.bz2 zsh-cleanup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zsh.spec ++++++ --- /var/tmp/diff_new_pack.x2E0rD/_old 2009-08-19 00:06:58.000000000 +0200 +++ /var/tmp/diff_new_pack.x2E0rD/_new 2009-08-19 00:06:58.000000000 +0200 @@ -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 @@ 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 @@ 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 @@ %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 @@ 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 @@ 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 @@ # 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 @@ %{__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} ++++++ zsh-4.3.6-doc.tar.bz2 -> zsh-4.3.10-doc.tar.bz2 ++++++ ++++ 104389 lines of diff (skipped) ++++++ zsh-4.3.10-doc_intro_paths.patch ++++++ --- 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>!$ +%\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
++++++ zsh-4.3.10-doc_makefile.patch ++++++
--- 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
++++++ zsh-4.3.10-run-help_pager.patch ++++++
--- 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
++++++ zsh-4.3.6-doc.tar.bz2 -> zsh-4.3.10.tar.bz2 ++++++
++++ 462252 lines of diff (skipped)
++++++ zsh-cleanup.patch ++++++
--- 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