diff --git a/osc.patch b/osc.patch deleted file mode 100644 index 4be6c00..0000000 --- a/osc.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- Completion/Unix/Command/_osc 2011-12-26 19:14:49.042099413 +0100 -+++ Completion/Unix/Command/_osc 2011-12-26 19:30:10.813449826 +0100 -@@ -16,8 +16,8 @@ - # 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" -+OSC_BUILD_TARGETS="openSUSE_11.2 openSUSE_11.3 openSUSE_11.4 openSUSE_12.1 openSUSE_Tumbleweed openSUSE_Factory SLE_11_SP1" -+OSC_PROJECTS="openSUSE:Factory openSUSE:Tumbleweed openSUSE:12.1 openSUSE:11.4 openSUSE:11.2 openSUSE:11.3" - - # user defined variables $OSC_BUILD_TARGETS_EXTRA and - # $OSC_PROJECTS_EXTRA can add to the project/build target list - ---- Completion/openSUSE/Command/_osc 2011-12-26 19:14:49.042099413 +0100 -+++ Completion/openSUSE/Command/_osc 2011-12-26 19:30:10.813449826 +0100 -@@ -16,8 +16,8 @@ - # 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" -+OSC_BUILD_TARGETS="openSUSE_11.2 openSUSE_11.3 openSUSE_11.4 openSUSE_12.1 openSUSE_Tumbleweed openSUSE_Factory SLE_11_SP1" -+OSC_PROJECTS="openSUSE:Factory openSUSE:Tumbleweed openSUSE:12.1 openSUSE:11.4 openSUSE:11.2 openSUSE:11.3" - - # user defined variables $OSC_BUILD_TARGETS_EXTRA and - # $OSC_PROJECTS_EXTRA can add to the project/build target list diff --git a/zsh-4.3.12-fix-c02cond-test.patch b/zsh-4.3.12-fix-c02cond-test.patch deleted file mode 100644 index 5739b4a..0000000 --- a/zsh-4.3.12-fix-c02cond-test.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit ea7e24879fe3e7bf59b4373708158d5c973282a6 -Author: Frank Terbeck -Date: Fri Dec 30 13:37:41 2011 +0000 - - 30048: C02cond.ztst: Avoid [[ -N ... ]] on file-systems mounted `noatime' - -diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst -index 629fdd2..5742755 100644 ---- a/Test/C02cond.ztst -+++ b/Test/C02cond.ztst -@@ -139,6 +139,9 @@ - elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then - print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)" - true -+ elif test -f /etc/mtab && { grep $(df . | tail -n1 | awk '{print $1}') /etc/mtab | grep -q noatime; }; then -+ print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with noatime file system)" -+ true - else - [[ -N newnewnew && ! -N unmodified ]] - fi diff --git a/zsh-4.3.15.tar.bz2 b/zsh-4.3.15.tar.bz2 deleted file mode 100644 index 5494a5d..0000000 --- a/zsh-4.3.15.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486 -size 2969951 diff --git a/zsh-4.3.17.tar.bz2 b/zsh-4.3.17.tar.bz2 new file mode 100644 index 0000000..94505c2 --- /dev/null +++ b/zsh-4.3.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:054e0452afd9c742c9f1489465175e1d4d7db50d88b602d132551d850cf7a704 +size 2978903 diff --git a/zsh-enable-openSUSE-completion-functions.patch b/zsh-enable-openSUSE-completion-functions.patch deleted file mode 100644 index 36f0931..0000000 --- a/zsh-enable-openSUSE-completion-functions.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: zsh-4.3.15/Src/Zle/complete.mdd -=================================================================== ---- zsh-4.3.15.orig/Src/Zle/complete.mdd -+++ zsh-4.3.15/Src/Zle/complete.mdd -@@ -1,7 +1,7 @@ - name=zsh/complete - link=either - load=yes --functions='Completion/*comp* Completion/AIX/*/* Completion/BSD/*/* Completion/Base/*/* Completion/Cygwin/*/* Completion/Darwin/*/* Completion/Debian/*/* Completion/Linux/*/* Completion/Mandriva/*/* Completion/Redhat/*/* Completion/Solaris/*/* Completion/Unix/*/* Completion/X/*/* Completion/Zsh/*/*' -+functions='Completion/*comp* Completion/AIX/*/* Completion/BSD/*/* Completion/Base/*/* Completion/Cygwin/*/* Completion/Darwin/*/* Completion/Debian/*/* Completion/Linux/*/* Completion/Mandriva/*/* Completion/Redhat/*/* Completion/Solaris/*/* Completion/openSUSE/*/* Completion/Unix/*/* Completion/X/*/* Completion/Zsh/*/*' - - moddeps="zsh/zle" - diff --git a/zsh.changes b/zsh.changes index a8a0815..5bfd17f 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 27 09:11:27 UTC 2012 - idonmez@suse.com + +- Update to version 4.3.17 + * Contains fixes for possible speed regression introduced + in 4.3.15 (new option HASH_EXECUTABLES_ONLY) + * Improvements to (bash) completion and shell emulation mode +- Drop all the patches, all upstream + ------------------------------------------------------------------- Tue Feb 7 14:27:18 CET 2012 - hmacht@suse.de diff --git a/zsh.spec b/zsh.spec index 4e56c78..3c8ec05 100644 --- a/zsh.spec +++ b/zsh.spec @@ -16,9 +16,8 @@ # - Name: zsh -Version: 4.3.15 +Version: 4.3.17 Release: 0 Summary: Shell with comprehensive completion License: MIT @@ -37,9 +36,6 @@ Source15: zshenv.rhs Source16: dotzshrc.rh Source17: zshprompt.pl %endif -Patch1: %{name}-4.3.12-fix-c02cond-test.patch -Patch2: osc.patch -Patch3: zsh-enable-openSUSE-completion-functions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -90,9 +86,6 @@ This package contains the Zsh manual in html format. %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -%patch2 -p0 -%patch3 -p1 # Remove executable bit chmod 0644 Etc/changelog2html.pl