From 48b742faa6058dd3f7675bec4a499787a6ce0164 Mon Sep 17 00:00:00 2001
From: John Dulaney <jdulaney@fedoraproject.org>
Date: Mon, 9 Jul 2018 09:58:13 -0700
Subject: [PATCH] Fix french i18n test issue

Signed-off-by: John Dulaney <jdulaney@fedoraproject.org>
---
 guile-i18ntest.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++
 guile22.spec         | 12 +++++----
 2 files changed, 69 insertions(+), 5 deletions(-)
 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/guile22.spec b/guile22.spec
index 8863bbc..5e6b6c1 100644
--- a/guile22.spec
+++ b/guile22.spec
@@ -11,7 +11,7 @@ Release: 5%{?dist}
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
 URL: http://www.gnu.org/software/guile/
 License: LGPLv3+
-BuildRequires: gcc libtool libtool-ltdl-devel gmp-devel readline-devel
+BuildRequires: libtool libtool-ltdl-devel gmp-devel readline-devel
 BuildRequires: gettext-devel libunistring-devel libffi-devel gc-devel
 Requires(post): /sbin/install-info
 Requires: coreutils
@@ -19,6 +19,7 @@ Requires: coreutils
 Provides: bundled(gnulib)
 
 Patch1: guile-multilib.patch
+Patch2: guile-i18ntest.patch
 Patch3: guile-threadstest.patch
 Patch4: disable-out-of-memory-test.patch
 
@@ -48,6 +49,7 @@ install the guile package.
 %prep
 %setup -q -n guile-%version
 %patch1 -p1 -b .multilib
+%patch2 -p1
 %patch3 -p1 -b .threadstest
 %patch4 -p1
 
@@ -111,14 +113,14 @@ make %{?_smp_mflags} check
 
 
 %post
-%?ldconfig
+/sbin/ldconfig
 for i in guile r5rs; do
     /sbin/install-info %{_infodir}/${i}-%{mver}.info.gz %{_infodir}/dir &> /dev/null
 done
 :
 
 
-%ldconfig_postun
+%postun -p /sbin/ldconfig
 
 
 %preun
@@ -186,8 +188,8 @@ fi
 
 
 %changelog
-* Wed Mar 14 2018 John Dulaney <jdulaney@fedoraproject.org> - 2.2.2-5
-- Investigate FTBFS
+* Sun Jul 07 2018 John Dulaney <jdulaney@fedoraproject.org> - 2.2.2-5
+- Fix French tests
 
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.2.2-4
 - Escape macros in %%changelog