Hello community, here is the log from the commit of package zsh for openSUSE:Factory checked in at 2012-02-01 10:01:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zsh (Old) and /work/SRC/openSUSE:Factory/.zsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zsh", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/zsh/zsh.changes 2012-01-04 07:33:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zsh.new/zsh.changes 2012-02-01 10:01:24.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 31 11:08:53 UTC 2012 - [email protected] + +- Update _osc completion + +------------------------------------------------------------------- +Sat Dec 31 10:44:15 UTC 2011 - [email protected] + +- Instead of disabling c02cond manually, add upstream patch to + automatically disable it on noatime mounted systems. + +------------------------------------------------------------------- Old: ---- zsh-4.3.12-disable-c02cond-test.patch New: ---- osc.patch zsh-4.3.12-fix-c02cond-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zsh.spec ++++++ --- /var/tmp/diff_new_pack.JENha0/_old 2012-02-01 10:01:28.000000000 +0100 +++ /var/tmp/diff_new_pack.JENha0/_new 2012-02-01 10:01:28.000000000 +0100 @@ -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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: zsh Version: 4.3.15 Release: 0 @@ -36,7 +35,8 @@ 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 +Patch2: osc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -71,6 +71,8 @@ %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,8 @@ %prep %setup -q -n %{name}-%{version} -%patch1 +%patch1 -p1 +%patch2 -p0 # Remove executable bit chmod 0644 Etc/changelog2html.pl ++++++ osc.patch ++++++ --- 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 ++++++ zsh-4.3.12-fix-c02cond-test.patch ++++++ commit ea7e24879fe3e7bf59b4373708158d5c973282a6 Author: Frank Terbeck <[email protected]> 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
