From 0a3b73d7a234bc56c8409a690a71aafb5e58e6ac Mon Sep 17 00:00:00 2001 From: Mairi Dulaney Date: Fri, 18 Jan 2019 10:03:38 -0800 Subject: [PATCH] Update to latest release 2.2.4 Signed-off-by: Mairi Dulaney --- .gitignore | 1 + guile-i18ntest.patch | 62 -------------------------------------------- guile22.spec | 11 ++++---- sources | 2 +- 4 files changed, 8 insertions(+), 68 deletions(-) delete mode 100644 guile-i18ntest.patch diff --git a/.gitignore b/.gitignore index 8099d50..29eeaa3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /guile-2.2.0.tar.xz /guile-2.2.1.tar.xz /guile-2.2.2.tar.xz +/guile-2.2.4.tar.xz diff --git a/guile-i18ntest.patch b/guile-i18ntest.patch deleted file mode 100644 index 098f194..0000000 --- a/guile-i18ntest.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 90aa389..642e285 100644 --- a/guile22.spec +++ b/guile22.spec @@ -6,8 +6,8 @@ Summary: A GNU implementation of Scheme for application extensibility Name: guile22 -Version: 2.2.2 -Release: 7%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz URL: http://www.gnu.org/software/guile/ License: LGPLv3+ @@ -19,7 +19,6 @@ Requires: coreutils Provides: bundled(gnulib) Patch1: guile-multilib.patch -Patch2: guile-i18ntest.patch Patch3: guile-threadstest.patch Patch4: disable-out-of-memory-test.patch @@ -49,7 +48,6 @@ install the guile package. %prep %setup -q -n guile-%version %patch1 -p1 -b .multilib -%patch2 -p1 %patch3 -p1 -b .threadstest %patch4 -p1 @@ -188,13 +186,16 @@ fi %changelog +* Fri Jan 18 2019 Mairi Dulaney - 2.2.4-1 +- Update to latest release - 2.2.4 + * Mon Jan 14 2019 Björn Esser - 2.2.2-7 - Rebuilt for libcrypt.so.2 (#1666033) * Fri Jul 13 2018 Fedora Release Engineering - 2.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Sun Jul 07 2018 John Dulaney - 2.2.2-5 +* Sat Jul 07 2018 John Dulaney - 2.2.2-5 - Fix French tests * Fri Feb 09 2018 Igor Gnatenko - 2.2.2-4 diff --git a/sources b/sources index 59324fc..fda4d02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (guile-2.2.2.tar.xz) = 83ce1daa40f8d0f18aa9babd8ef49de0592dd67e45da4316d2ec395890001f6c5536538a145ba253c97f1981f2fcf7eabb2a17655edd3fc3b54b6199c119f821 +SHA512 (guile-2.2.4.tar.xz) = 1ecacc6493877424b6d4ed5296568bd4587c7a222d3460bf2fa590ef44db2d7a79deeee362d2ca572fe612242193a68fa100c7cf6d407a338d24927dbf9d1703