Accepting request 102187 from shells
- Update _osc completion - Instead of disabling c02cond manually, add upstream patch to automatically disable it on noatime mounted systems. OBS-URL: https://build.opensuse.org/request/show/102187 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zsh?expand=0&rev=37
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
6b737582d5
27
osc.patch
Normal file
27
osc.patch
Normal file
@ -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
|
||||
@ -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
|
||||
20
zsh-4.3.12-fix-c02cond-test.patch
Normal file
20
zsh-4.3.12-fix-c02cond-test.patch
Normal file
@ -0,0 +1,20 @@
|
||||
commit ea7e24879fe3e7bf59b4373708158d5c973282a6
|
||||
Author: Frank Terbeck <bewater@users.sourceforge.net>
|
||||
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
|
||||
11
zsh.changes
11
zsh.changes
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- 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
|
||||
|
||||
|
||||
11
zsh.spec
11
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
|
||||
@ -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 @@ 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
|
||||
Patch2: osc.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,8 @@ This package contains the Zsh manual in html format.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1
|
||||
%patch1 -p1
|
||||
%patch2 -p0
|
||||
|
||||
# Remove executable bit
|
||||
chmod 0644 Etc/changelog2html.pl
|
||||
|
||||
Loading…
Reference in New Issue
Block a user