From f1f66c81d929186da5070a04bb9f7e48fa47cc5c574c03414a6b96d52a6c89a9 Mon Sep 17 00:00:00 2001 From: Hendrik Vogelsang Date: Fri, 11 Feb 2011 10:49:56 +0000 Subject: [PATCH] Accepting request 56833 from home:elvigia:branches:shells reviewed okay OBS-URL: https://build.opensuse.org/request/show/56833 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=42 --- _osc | 27 ++++++++++++++----- _service | 23 ++++++++++++++++ _service:download_url:zsh-4.3.11-doc.tar.bz2 | 3 +++ _service:download_url:zsh-4.3.11.tar.bz2 | 3 +++ ready | 0 zsh-4.3.10-doc.tar.bz2 | 3 --- zsh-4.3.10.tar.bz2 | 3 --- ....patch => zsh-4.3.11-doc_intro_paths.patch | 12 +++------ ...ile.patch => zsh-4.3.11-doc_makefile.patch | 8 +++--- ...r.patch => zsh-4.3.11-run-help_pager.patch | 6 ++--- zsh-cleanup.patch | 6 ++--- zsh.changes | 18 +++++++++++++ zsh.spec | 7 ++--- 13 files changed, 85 insertions(+), 34 deletions(-) create mode 100644 _service create mode 100644 _service:download_url:zsh-4.3.11-doc.tar.bz2 create mode 100644 _service:download_url:zsh-4.3.11.tar.bz2 delete mode 100644 ready delete mode 100644 zsh-4.3.10-doc.tar.bz2 delete mode 100644 zsh-4.3.10.tar.bz2 rename zsh-4.3.10-doc_intro_paths.patch => zsh-4.3.11-doc_intro_paths.patch (77%) rename zsh-4.3.10-doc_makefile.patch => zsh-4.3.11-doc_makefile.patch (90%) rename zsh-4.3.10-run-help_pager.patch => zsh-4.3.11-run-help_pager.patch (85%) diff --git a/_osc b/_osc index ad90ee1..2b47c8e 100644 --- a/_osc +++ b/_osc @@ -1,6 +1,6 @@ #compdef osc # -# Copyright (C) 2009 Holger Macht +# Copyright (C) 2009,2010 Holger Macht # # This file is released under the GPLv2. # @@ -8,9 +8,22 @@ # # Toggle verbose completions: zstyle ':completion:*:osc:*' verbose no # zstyle ':completion:*:osc-subcommand:*' verbose no +# +# Use the variables $ZSH_OSC_BUILD_TARGETS_EXTRA and $ZSH_OSC_PROJECTS_EXTRA to +# extend the list of possible completions in your ~/.zshrc like that: +# export OSC_PROJECTS_EXTRA="Base:System Base:shells" # -# version 0.1 +# version 0.2 # + +OSC_BUILD_TARGETS="openSUSE_10.2 openSUSE_10.3 openSUSE_11.0 openSUSE_11.1 openSUSE_11.2 openSUSE_11.3 openSUSE_Factory" +OSC_PROJECTS="openSUSE:Factory openSUSE:11.2 openSUSE:11.3 openSUSE:11.1 openSUSE:11.0 openSUSE:10.3" + +# user defined variables $OSC_BUILD_TARGETS_EXTRA and +# $OSC_PROJECTS_EXTRA can add to the project/build target list +OSC_BUILD_TARGETS="$OSC_BUILD_TARGETS $ZSH_OSC_BUILD_TARGETS_EXTRA" +OSC_PROJECTS="$OSC_PROJECTS $ZSH_OSC_PROJECTS_EXTRA" + # Main dispatcher _osc() { @@ -29,7 +42,7 @@ _osc() { _osc_cmd_getbinaries elif [ "$cmd" = "checkout" -o "$cmd" = "co" -o "$cmd" = "branch" ]; then _osc_cmd_checkout - elif [ "$cmd" = "buildlog" -o "$cmd" = "buildinfo" ]; then + elif [ "$cmd" = "buildlog" -o "$cmd" = "buildinfo" -o "$cmd" = "bl" ]; then _osc_cmd_buildlog else _osc_cmd_do $cmd @@ -57,21 +70,21 @@ _osc() { _osc_cmd_getbinaries() { _arguments \ - '1:PROJECT:(PROJECT)' \ + '1:PROJECT:( `echo $OSC_PROJECTS` )' \ '2:PACKAGE:(PACKAGE)' \ - '3:REPOSITORY:( openSUSE_10.2 openSUSE_10.3 openSUSE_11.0 openSUSE_11.1 openSUSE_Factory SUSE_SLE-11_GA )' \ + '3:REPOSITORY:( `echo $OSC_BUILD_TARGETS` )' \ '4:ARCHITECTURE:(i586 x86_64)' } _osc_cmd_checkout() { _arguments \ - '1:PROJECT:( openSUSE:Factory openSUSE:11.1 openSUSE:11.0 openSUSE:10.3 )' \ + '1:PROJECT:( `echo $OSC_PROJECTS` )' \ '2:PACKAGE:(PACKAGE)' } _osc_cmd_buildlog() { _arguments \ - '1:REPOSITORY:( openSUSE_10.2 openSUSE_10.3 openSUSE_11.0 openSUSE_11.1 openSUSE_Factory SUSE_SLE-11_GA )' \ + '1:REPOSITORY:( `echo $OSC_BUILD_TARGETS` )' \ '2:ARCHITECTURE:(i586 x86_64)' } diff --git a/_service b/_service new file mode 100644 index 0000000..49a57ab --- /dev/null +++ b/_service @@ -0,0 +1,23 @@ + + + + http + www.zsh.org + /pub/zsh-4.3.11.tar.bz2 + + + _service:download_url:zsh-4.3.11.tar.bz2 + sha256 + 30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05 + + + http + www.zsh.org + /pub/zsh-4.3.11-doc.tar.bz2 + + + _service:download_url:zsh-4.3.11-doc.tar.bz2 + sha256 + 956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c + + diff --git a/_service:download_url:zsh-4.3.11-doc.tar.bz2 b/_service:download_url:zsh-4.3.11-doc.tar.bz2 new file mode 100644 index 0000000..9e0652b --- /dev/null +++ b/_service:download_url:zsh-4.3.11-doc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c +size 2687527 diff --git a/_service:download_url:zsh-4.3.11.tar.bz2 b/_service:download_url:zsh-4.3.11.tar.bz2 new file mode 100644 index 0000000..5e69eac --- /dev/null +++ b/_service:download_url:zsh-4.3.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05 +size 2868429 diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/zsh-4.3.10-doc.tar.bz2 b/zsh-4.3.10-doc.tar.bz2 deleted file mode 100644 index e62cab1..0000000 --- a/zsh-4.3.10-doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f53d5c434fdb26fc79755279175514507eb1d11cf793ac57270d053ee61f37f9 -size 2690183 diff --git a/zsh-4.3.10.tar.bz2 b/zsh-4.3.10.tar.bz2 deleted file mode 100644 index 53ecbb9..0000000 --- a/zsh-4.3.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c -size 2735665 diff --git a/zsh-4.3.10-doc_intro_paths.patch b/zsh-4.3.11-doc_intro_paths.patch similarity index 77% rename from zsh-4.3.10-doc_intro_paths.patch rename to zsh-4.3.11-doc_intro_paths.patch index 6ddc15d..a2b3aae 100644 --- a/zsh-4.3.10-doc_intro_paths.patch +++ b/zsh-4.3.11-doc_intro_paths.patch @@ -1,7 +1,5 @@ -Index: Doc/intro.ms -=================================================================== ---- Doc/intro.ms.orig 2007-07-03 19:03:03.000000000 +0200 -+++ Doc/intro.ms 2009-12-02 19:12:41.000000000 +0100 +--- Doc/intro.ms.orig ++++ Doc/intro.ms @@ -516,13 +516,13 @@ separate process is not created.) %\0ed\0/tmp/funs/yp 25 @@ -39,10 +37,8 @@ Index: Doc/intro.ms .De If you use more words of the same command, only the first \fC!\fP needs an event designator. -Index: Test/E01options.ztst -=================================================================== ---- Test/E01options.ztst.orig 2008-08-11 10:38:57.000000000 +0200 -+++ Test/E01options.ztst 2009-12-02 19:12:41.000000000 +0100 +--- Test/E01options.ztst.orig ++++ Test/E01options.ztst @@ -116,7 +116,7 @@ >scalar diff --git a/zsh-4.3.10-doc_makefile.patch b/zsh-4.3.11-doc_makefile.patch similarity index 90% rename from zsh-4.3.10-doc_makefile.patch rename to zsh-4.3.11-doc_makefile.patch index d54a3f2..3864336 100644 --- a/zsh-4.3.10-doc_makefile.patch +++ b/zsh-4.3.11-doc_makefile.patch @@ -1,6 +1,6 @@ ---- Doc/Makefile.in +--- Doc/Makefile.in.orig +++ Doc/Makefile.in -@@ -40,7 +40,7 @@ +@@ -40,7 +40,7 @@ INSTALL = @INSTALL@ MAKEINFO = makeinfo TEXI2DVI = texi2dvi DVIPS = dvips @@ -9,7 +9,7 @@ .SUFFIXES: .yo .1 -@@ -294,26 +294,9 @@ +@@ -294,26 +294,9 @@ install.man: man # install info pages, creating install directory if necessary install.info: texi ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) @@ -39,7 +39,7 @@ .PHONY: install.info # uninstall man pages -@@ -332,7 +315,7 @@ +@@ -332,7 +315,7 @@ uninstall.info: # install HTML manual install.html: html ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) diff --git a/zsh-4.3.10-run-help_pager.patch b/zsh-4.3.11-run-help_pager.patch similarity index 85% rename from zsh-4.3.10-run-help_pager.patch rename to zsh-4.3.11-run-help_pager.patch index 22fc2b4..c43be24 100644 --- a/zsh-4.3.10-run-help_pager.patch +++ b/zsh-4.3.11-run-help_pager.patch @@ -1,6 +1,6 @@ ---- Functions/Misc/run-help +--- Functions/Misc/run-help.orig +++ Functions/Misc/run-help -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ then return 0 elif [[ -n "${HELPDIR:-}" && -r $HELPDIR/$1 && $1 != compctl ]] then @@ -9,7 +9,7 @@ return $? fi -@@ -64,7 +64,7 @@ +@@ -65,7 +65,7 @@ do (comp*) man zshcompsys;; (zf*) man zshftpsys;; (run-help) man zshcontrib;; diff --git a/zsh-cleanup.patch b/zsh-cleanup.patch index edd69b2..972f42e 100644 --- a/zsh-cleanup.patch +++ b/zsh-cleanup.patch @@ -1,6 +1,6 @@ ---- Src/Makefile.in +--- Src/Makefile.in.orig +++ Src/Makefile.in -@@ -148,14 +148,7 @@ +@@ -149,14 +149,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) @@ -16,7 +16,7 @@ .PHONY: install.bin-here install.bin-N: ---- Src/Modules/terminfo.c +--- Src/Modules/terminfo.c.orig +++ Src/Modules/terminfo.c @@ -28,6 +28,7 @@ */ diff --git a/zsh.changes b/zsh.changes index ae29f52..41ed8ef 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Dec 29 02:07:58 UTC 2010 - cristian.rodriguez@opensuse.org + +- Update to version 4.3.11 +* The completion system now has a style path-completion. +* new "zsystem" builtin whose subcommands perform system level tasks +* Added "D" and "Z" flag in parameter expansion +* Lots of other bugfixes/improvements, see Changelog + +------------------------------------------------------------------- +Tue Mar 9 11:50:17 CET 2010 - hmacht@suse.de + +- update completion for _osc: + - add new products openSUSE 11.2 and openSUSE 11.3 + - add possibility to extend the list of projects and build + targets with user defined variables + $ZSH_OSC_BUILD_TARGETS_EXTRA and $ZSH_OSC_PROJECTS_EXTRA + ------------------------------------------------------------------- Wed Dec 2 18:14:17 UTC 2009 - coolo@novell.com diff --git a/zsh.spec b/zsh.spec index 7d5585d..7ce1b9b 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,7 +1,7 @@ # # spec file for package zsh (Version 4.3.10) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,8 @@ Name: zsh -Version: 4.3.10 -Release: 4 +Version: 4.3.11 +Release: 5 License: Other uncritical OpenSource License Group: System/Shells BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -136,6 +136,7 @@ groff Doc/intro.ms > intro.txt %{__ln_s} -f ../../bin/zsh %{buildroot}/usr/bin/zsh %fdupes $RPM_BUILD_ROOT + %clean %{__rm} -rf %{buildroot}