diff --git a/findutils-4.6.0-mbrtowc-tests.patch b/findutils-4.6.0-mbrtowc-tests.patch new file mode 100644 index 0000000..a140654 --- /dev/null +++ b/findutils-4.6.0-mbrtowc-tests.patch @@ -0,0 +1,35 @@ +From 06a46ba755195810f2aeda01b12d1ccfe7c2dcfd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Mon, 28 Dec 2015 06:27:42 +0900 +Subject: [PATCH] maint: fix operator precedence in mbrtowc test + +This is a fix for test breakage introduced by commit 45228d96; the +equality expression must be parenthesized when negated with '!', +otherwise we always get: + + test-mbrtowc.c:49: assertion 'ret == (size_t)(-2)' failed + +* m4/mbrtowc.m4 (gl_MBRTOWC_EMPTY_INPUT): Negate the entire expression. + +Upstream-commit: 1f63650823cebf52044df840c81062ccb52163a2 +Signed-off-by: Kamil Dudka +--- + gl/m4/mbrtowc.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gl/m4/mbrtowc.m4 b/gl/m4/mbrtowc.m4 +index deb9f06..be2e9d6 100644 +--- a/gl/m4/mbrtowc.m4 ++++ b/gl/m4/mbrtowc.m4 +@@ -569,7 +569,7 @@ changequote([,])dnl + int + main (void) + { +- return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2; ++ return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2; + }]])], + [gl_cv_func_mbrtowc_empty_input=yes], + [gl_cv_func_mbrtowc_empty_input=no], +-- +2.5.0 + diff --git a/findutils.spec b/findutils.spec index 9eac1e0..416cf87 100644 --- a/findutils.spec +++ b/findutils.spec @@ -8,6 +8,9 @@ Group: Applications/File URL: http://www.gnu.org/software/findutils/ Source0: ftp://ftp.gnu.org/pub/gnu/findutils/%{name}-%{version}.tar.gz +# prevent mbrtowc tests from failing (#1294016) +Patch0: findutils-4.6.0-mbrtowc-tests.patch + # do not build locate Patch1: findutils-4.5.15-no-locate.patch @@ -47,6 +50,7 @@ useful for finding things on your system. %prep %setup -q rm -rf locate +%patch0 -p1 %patch1 -p1 %patch3 -p1 %patch4 -p1 @@ -102,6 +106,7 @@ fi %changelog * Wed Jan 06 2016 Kamil Dudka - 1:4.6.0-2 - prevent test-isinf from failing with gcc-5.3.1 on ppc64le (#1294016) +- prevent mbrtowc tests from failing (#1294016) * Tue Dec 29 2015 Kamil Dudka - 1:4.6.0-1 - new upstream release