From 4a985d8ea2e98e53092883d838cb0465d615a450 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 10 Oct 2017 15:27:27 +0200 Subject: fix i18n test for new glibc using different thousands separator (#1493170) --- guile-i18ntest.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ guile.spec | 2 ++ 2 files changed, 64 insertions(+) create mode 100644 guile-i18ntest.patch diff --git a/guile-i18ntest.patch b/guile-i18ntest.patch new file mode 100644 index 0000000..098f194 --- /dev/null +++ b/guile-i18ntest.patch @@ -0,0 +1,62 @@ +diff -up guile-2.0.14/test-suite/tests/i18n.test.i18ntest guile-2.0.14/test-suite/tests/i18n.test +--- guile-2.0.14/test-suite/tests/i18n.test.i18ntest 2017-02-13 21:32:39.000000000 +0100 ++++ guile-2.0.14/test-suite/tests/i18n.test 2017-10-10 13:25:47.492589702 +0200 +@@ -527,28 +527,28 @@ + (with-test-prefix "French" + + (pass-if-equal "integer" +- "123 456" ++ "123\xa0456" + (under-french-locale-or-unresolved + (lambda () + (let ((fr (make-locale LC_ALL %french-locale-name))) + (number->locale-string 123456 #t fr))))) + + (pass-if-equal "negative integer" +- "-1 234 567" ++ "-1\xa0234\xa0567" + (under-french-locale-or-unresolved + (lambda () + (let ((fr (make-locale LC_ALL %french-locale-name))) + (number->locale-string -1234567 #t fr))))) + + (pass-if-equal "fraction" +- "1 234,567" ++ "1\xa0234,567" + (under-french-locale-or-unresolved + (lambda () + (let ((fr (make-locale LC_ALL %french-locale-name))) + (number->locale-string 1234.567 #t fr))))) + + (pass-if-equal "fraction, 1 digit" +- "1 234,6" ++ "1\xa0234,6" + (under-french-locale-or-unresolved + (lambda () + (let ((fr (make-locale LC_ALL %french-locale-name))) +@@ -563,7 +563,7 @@ + (with-test-prefix "French" + + (pass-if-equal "12345.678" +- "12 345,678" ++ "12\xa0345,678" + (under-french-locale-or-unresolved + (lambda () + (if (null? (locale-digit-grouping %french-locale)) +@@ -586,14 +586,14 @@ + (with-test-prefix "French" + + (pass-if-equal "integer" +- "123 456,00 +EUR" ++ "123\xa0456,00 +EUR" + (under-french-locale-or-unresolved + (lambda () + (let ((fr (make-locale LC_ALL %french-locale-name))) + (monetary-amount->locale-string 123456 #f fr))))) + + (pass-if-equal "fraction" +- "1 234,57 EUR " ++ "1\xa0234,57 EUR " + (under-french-locale-or-unresolved + (lambda () + (let ((fr (make-locale LC_ALL %french-locale-name))) diff --git a/guile.spec b/guile.spec index c3cfb74..a6ae83c 100644 --- a/guile.spec +++ b/guile.spec @@ -15,6 +15,7 @@ Requires(preun): /sbin/install-info Requires: coreutils Patch1: guile-multilib.patch +Patch2: guile-i18ntest.patch Patch3: guile-threadstest.patch %description @@ -44,6 +45,7 @@ install the guile package. %prep %setup -q -n guile-%version %patch1 -p1 -b .multilib +%patch2 -p1 -b .i18ntest %patch3 -p1 -b .threadstest %build -- cgit