rpm/zsh
SHA256
1
0
Fork 0
forked from pool/zsh
Code Pull Requests Activity

- Instead of disabling c02cond manually, add upstream patch to

Browse Source 
automatically disable it on noatime mounted systems.

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=91
This commit is contained in:
Ismail Dönmez 2011-12-31 10:48:20 +00:00 committed by Git OBS Bridge
parent 61630cdf59
commit a5ec82c2a3
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zsh-4.3.12-disable-c02cond-test.patch
View File

@ -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
View 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

6
zsh.changes
View File

@ -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

6
zsh.spec
View File

@ -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