From a5ec82c2a3bc3b51ebecab6c06a1a544f94a9f1e7325b6d3ea637d2d4af48fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 31 Dec 2011 10:48:20 +0000 Subject: [PATCH 1/3] - Instead of disabling c02cond manually, add upstream patch to automatically disable it on noatime mounted systems. OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=91 --- zsh-4.3.12-disable-c02cond-test.patch | 11 ----------- zsh-4.3.12-fix-c02cond-test.patch | 20 ++++++++++++++++++++ zsh.changes | 6 ++++++ zsh.spec | 6 ++++-- 4 files changed, 30 insertions(+), 13 deletions(-) delete mode 100644 zsh-4.3.12-disable-c02cond-test.patch create mode 100644 zsh-4.3.12-fix-c02cond-test.patch diff --git a/zsh-4.3.12-disable-c02cond-test.patch b/zsh-4.3.12-disable-c02cond-test.patch deleted file mode 100644 index b8561c2..0000000 --- a/zsh-4.3.12-disable-c02cond-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Test/C02cond.ztst 2011-01-07 10:39:22.000000000 +0100 -+++ Test/C02cond.ztst 2011-04-21 20:21:32.000000000 +0200 -@@ -140,7 +140,7 @@ - print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)" - true - else -- [[ -N newnewnew && ! -N unmodified ]] -+ true - fi - 0:-N cond - F:This test can fail on NFS-mounted filesystems as the access and diff --git a/zsh-4.3.12-fix-c02cond-test.patch b/zsh-4.3.12-fix-c02cond-test.patch new file mode 100644 index 0000000..5739b4a --- /dev/null +++ b/zsh-4.3.12-fix-c02cond-test.patch @@ -0,0 +1,20 @@ +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.changes b/zsh.changes index 74419e6..2a750a2 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 31 10:44:15 UTC 2011 - idonmez@suse.com + +- Instead of disabling c02cond manually, add upstream patch to + automatically disable it on noatime mounted systems. + ------------------------------------------------------------------- Tue Dec 20 09:27:59 UTC 2011 - idonmez@suse.com diff --git a/zsh.spec b/zsh.spec index e4af30c..019ffb4 100644 --- a/zsh.spec +++ b/zsh.spec @@ -36,7 +36,7 @@ Source15: zshenv.rhs Source16: dotzshrc.rh Source17: zshprompt.pl %endif -Patch1: %{name}-4.3.12-disable-c02cond-test.patch +Patch1: %{name}-4.3.12-fix-c02cond-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -71,6 +71,8 @@ Zsh is well known for its command line completion. %package htmldoc Summary: Zsh shell manual in html format +Group: System/Shells +Provides: %{name}-html = %{version} Obsoletes: %{name}-html < %{version} %description htmldoc @@ -85,7 +87,7 @@ This package contains the Zsh manual in html format. %prep %setup -q -n %{name}-%{version} -%patch1 +%patch1 -p1 # Remove executable bit chmod 0644 Etc/changelog2html.pl From 3a58e4a8e47562b8b67c25f93d9b71b0aef9963c8bc9e5373ee351645ad60681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 31 Jan 2012 11:04:28 +0000 Subject: [PATCH 2/3] Accepting request 102182 from home:seilerphilipp I hope this is what you wanted I didn't changed the *.changes this patch provides new osc completion functions for the new opensuse versions. Also I removed old opensuse versions OBS-URL: https://build.opensuse.org/request/show/102182 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=94 --- osc.patch | 27 +++++++++++++++++++++++++++ zsh.spec | 5 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 osc.patch diff --git a/osc.patch b/osc.patch new file mode 100644 index 0000000..4be6c00 --- /dev/null +++ b/osc.patch @@ -0,0 +1,27 @@ +--- 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.spec b/zsh.spec index 019ffb4..04de4b2 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,7 +1,7 @@ # # spec file for package zsh # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,6 +16,7 @@ # + Name: zsh Version: 4.3.15 Release: 0 @@ -37,6 +38,7 @@ Source16: dotzshrc.rh Source17: zshprompt.pl %endif Patch1: %{name}-4.3.12-fix-c02cond-test.patch +Patch2: osc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -88,6 +90,7 @@ This package contains the Zsh manual in html format. %prep %setup -q -n %{name}-%{version} %patch1 -p1 +%patch2 -p0 # Remove executable bit chmod 0644 Etc/changelog2html.pl From 47701ce2cd32e87d95945569a7ed66187b35993cabf694caf237c95aecae392f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 31 Jan 2012 11:08:01 +0000 Subject: [PATCH 3/3] - Update _osc completion OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=95 --- zsh.changes | 5 +++++ zsh.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zsh.changes b/zsh.changes index 2a750a2..43417d2 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 31 11:08:53 UTC 2012 - idonmez@suse.com + +- Update _osc completion + ------------------------------------------------------------------- Sat Dec 31 10:44:15 UTC 2011 - idonmez@suse.com diff --git a/zsh.spec b/zsh.spec index 04de4b2..847c97f 100644 --- a/zsh.spec +++ b/zsh.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: zsh Version: 4.3.15 Release: 0