- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-guile-1.8.7.tar.gz

.gitignore

@@ -0,0 +1 @@
+/guile-2.0.14.tar.xz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: guile
-# $Id: Makefile,v 1.1 2004/09/09 06:02:10 cvsdist Exp $
-NAME := guile
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

guile-1.8.6-deplibs.patch

@@ -1,48 +0,0 @@
-diff -up guile-1.8.6/guile-config/guile-config.in.deplibs guile-1.8.6/guile-config/guile-config.in
---- guile-1.8.6/guile-config/guile-config.in.deplibs	2008-12-04 19:30:41.000000000 +0100
-+++ guile-1.8.6/guile-config/guile-config.in	2008-12-09 12:17:48.000000000 +0100
-@@ -152,10 +152,10 @@
- 	      (list
- 	       (get-build-info 'CFLAGS)
-                (if (or (string=? libdir "/usr/lib")
--                       (string=? libdir "/usr/lib/"))
-+                       (string=? libdir "/usr/lib64"))
- 		   ""
- 		   (string-append "-L" (get-build-info 'libdir)))
--               "-lguile -lltdl"
-+               "-lguile"
- 	       (string-join other-flags)
- 
- 	       )))
-diff -up guile-1.8.6/libguile/Makefile.in.deplibs guile-1.8.6/libguile/Makefile.in
---- guile-1.8.6/libguile/Makefile.in.deplibs	2008-12-09 12:15:36.000000000 +0100
-+++ guile-1.8.6/libguile/Makefile.in	2008-12-09 12:15:36.000000000 +0100
-@@ -456,7 +456,7 @@ noinst_HEADERS = convert.i.c					\
- 
- libguile_la_DEPENDENCIES = @LIBLOBJS@
- libguile_la_LIBADD = @LIBLOBJS@
--libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
-+libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined -pthread
- 
- # These are headers visible as <guile/mumble.h>
- pkginclude_HEADERS = gh.h
-@@ -2026,8 +2026,8 @@ libpath.h: $(srcdir)/Makefile.in  $(top_
- 	@echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp
- 	@echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
- 	@echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
--	@echo '	{ "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp
--	@echo ' { "top_srcdir",    "@top_srcdir_absolute@" }, \' >> libpath.tmp
-+	@echo '	{ "srcdir", "" }, \' >> libpath.tmp
-+	@echo ' { "top_srcdir",    "" }, \' >> libpath.tmp
- 	@echo '	{ "prefix",	   "@prefix@" }, \' >> libpath.tmp
- 	@echo '	{ "exec_prefix",   "@exec_prefix@" }, \' >> libpath.tmp
- 	@echo '	{ "bindir",	   "@bindir@" }, \' >> libpath.tmp
-@@ -2048,7 +2048,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_
- 	@echo '	{ "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp
- 	@echo '	{ "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \
- 		>> libpath.tmp
--	@echo '	{ "LIBS",	   "@GUILE_LIBS@" }, \' >> libpath.tmp
-+	@echo '	{ "LIBS",	   "" }, \' >> libpath.tmp
- 	@echo '	{ "CFLAGS",	   "@GUILE_CFLAGS@" }, \' >> libpath.tmp
- 	@echo '	{ "buildstamp",    "'"`date`"'" }, \' >> libpath.tmp
- 	@echo '}' >> libpath.tmp

guile-1.8.7-ia64jmp.patch

@@ -1,206 +0,0 @@
-commit e4d87bf9fd36fdf572bde0604168bcf7d2e9838d
-Author: Neil Jerram <neil@ossau.uklinux.net>
-Date:   Wed Aug 5 16:13:28 2009 +0100
-
-    Avoid clash with system setjmp/longjmp on IA64
-    
-    Problem was that if an application includes both libguile.h and the
-    system's setjmp.h, and is compiled on IA64, it gets compile errors
-    because of jmp_buf, setjmp and longjmp being multiply defined.
-    
-    * libguile/__scm.h (__ia64__): Define scm_i_jmp_buf, SCM_I_SETJMP and
-      SCM_I_LONGJMP instead of jmp_buf, setjmp and longjmp.
-    
-      (all other platforms): Map scm_i_jmp_buf, SCM_I_SETJMP and
-      SCM_I_LONGJMP to jmp_buf, setjmp and longjmp.
-    
-    * libguile/continuations.c (scm_make_continuation): Use `SCM_I_SETJMP'
-      instead of `setjmp'.
-      (copy_stack_and_call): Use `SCM_I_LONJMP' instead of `longjmp'.
-      (scm_ia64_longjmp): Use type `scm_i_jmp_buf' instead of `jmp_buf'.
-    
-    * libguile/continuations.h (scm_t_contregs): Use type `scm_i_jmp_buf'
-      instead of `jmp_buf'.
-    
-    * libguile/threads.c (suspend): Use `SCM_I_SETJMP' instead of
-      `setjmp'.
-    
-    * libguile/threads.h (scm_i_thread): Use type `scm_i_jmp_buf' instead
-      of `jmp_buf'.
-    
-    * libguile/throw.c (JBJMPBUF, make_jmpbuf, jmp_buf_and_retval): Use
-      type `scm_i_jmp_buf' instead of `jmp_buf'.
-      (scm_c_catch): Use `SCM_I_SETJMP' instead of `setjmp'.
-      (scm_ithrow): Use `SCM_I_LONGJMP' instead of `longjmp'.
-
-diff --git a/libguile/__scm.h b/libguile/__scm.h
-index b198f9d..a18ab9f 100644
---- a/libguile/__scm.h
-+++ b/libguile/__scm.h
-@@ -409,19 +409,28 @@
-     typedef struct {
-       ucontext_t ctx;
-       int fresh;
--    } jmp_buf;
--#   define setjmp(JB)				        \
-+    } scm_i_jmp_buf;
-+#   define SCM_I_SETJMP(JB)			        \
-       ( (JB).fresh = 1,				        \
-         getcontext (&((JB).ctx)),			\
-         ((JB).fresh ? ((JB).fresh = 0, 0) : 1) )
--#   define longjmp(JB,VAL) scm_ia64_longjmp (&(JB), VAL)
--    void scm_ia64_longjmp (jmp_buf *, int);
-+#   define SCM_I_LONGJMP(JB,VAL) scm_ia64_longjmp (&(JB), VAL)
-+    void scm_ia64_longjmp (scm_i_jmp_buf *, int);
- #  else                 	/* ndef __ia64__ */
- #   include <setjmp.h>
- #  endif			/* ndef __ia64__ */
- # endif				/* ndef _CRAY1 */
- #endif				/* ndef vms */
- 
-+/* For any platform where SCM_I_SETJMP hasn't been defined in some
-+   special way above, map SCM_I_SETJMP, SCM_I_LONGJMP and
-+   scm_i_jmp_buf to setjmp, longjmp and jmp_buf. */
-+#ifndef SCM_I_SETJMP
-+#define scm_i_jmp_buf jmp_buf
-+#define SCM_I_SETJMP setjmp
-+#define SCM_I_LONGJMP longjmp
-+#endif
-+
- /* James Clark came up with this neat one instruction fix for
-  * continuations on the SPARC.  It flushes the register windows so
-  * that all the state of the process is contained in the stack.
-diff --git a/libguile/continuations.c b/libguile/continuations.c
-index 69d2569..84a7fed 100644
---- a/libguile/continuations.c
-+++ b/libguile/continuations.c
-@@ -127,7 +127,7 @@ scm_make_continuation (int *first)
-   continuation->offset = continuation->stack - src;
-   memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
- 
--  *first = !setjmp (continuation->jmpbuf);
-+  *first = !SCM_I_SETJMP (continuation->jmpbuf);
-   if (*first)
-     {
- #ifdef __ia64__
-@@ -224,12 +224,12 @@ copy_stack_and_call (scm_t_contregs *continuation, SCM val,
-   scm_i_set_last_debug_frame (continuation->dframe);
- 
-   continuation->throw_value = val;
--  longjmp (continuation->jmpbuf, 1);
-+  SCM_I_LONGJMP (continuation->jmpbuf, 1);
- }
- 
- #ifdef __ia64__
- void
--scm_ia64_longjmp (jmp_buf *JB, int VAL)
-+scm_ia64_longjmp (scm_i_jmp_buf *JB, int VAL)
- {
-   scm_i_thread *t = SCM_I_CURRENT_THREAD;
- 
-diff --git a/libguile/continuations.h b/libguile/continuations.h
-index f6fb96a..c61ab2d 100644
---- a/libguile/continuations.h
-+++ b/libguile/continuations.h
-@@ -43,7 +43,7 @@ SCM_API scm_t_bits scm_tc16_continuation;
- typedef struct 
- {
-   SCM throw_value;
--  jmp_buf jmpbuf;
-+  scm_i_jmp_buf jmpbuf;
-   SCM dynenv;
- #ifdef __ia64__
-   void *backing_store;
-diff --git a/libguile/threads.c b/libguile/threads.c
-index 95a905c..f2bb556 100644
---- a/libguile/threads.c
-+++ b/libguile/threads.c
-@@ -276,7 +276,7 @@ unblock_from_queue (SCM queue)
-       var 't'
-       // save registers.
-       SCM_FLUSH_REGISTER_WINDOWS;      // sparc only
--      setjmp (t->regs);                // here's most of the magic
-+      SCM_I_SETJMP (t->regs);          // here's most of the magic
- 
-    ... and returns.
- 
-@@ -330,7 +330,7 @@ unblock_from_queue (SCM queue)
-       t->top = SCM_STACK_PTR (&t);
-       // save registers.
-       SCM_FLUSH_REGISTER_WINDOWS;
--      setjmp (t->regs);
-+      SCM_I_SETJMP (t->regs);
-       res = func(data);
-       scm_enter_guile (t);
- 
-@@ -388,7 +388,7 @@ suspend (void)
-   t->top = SCM_STACK_PTR (&t);
-   /* save registers. */
-   SCM_FLUSH_REGISTER_WINDOWS;
--  setjmp (t->regs);
-+  SCM_I_SETJMP (t->regs);
-   return t;
- }
- 
-diff --git a/libguile/threads.h b/libguile/threads.h
-index 2b0e067..e22d9bd 100644
---- a/libguile/threads.h
-+++ b/libguile/threads.h
-@@ -107,7 +107,7 @@ typedef struct scm_i_thread {
-   /* For keeping track of the stack and registers. */
-   SCM_STACKITEM *base;
-   SCM_STACKITEM *top;
--  jmp_buf regs;
-+  scm_i_jmp_buf regs;
- #ifdef __ia64__
-   void *register_backing_store_base;
-   scm_t_contregs *pending_rbs_continuation;
-diff --git a/libguile/throw.c b/libguile/throw.c
-index 92c5a1a..fcfde47 100644
---- a/libguile/throw.c
-+++ b/libguile/throw.c
-@@ -53,7 +53,7 @@ static scm_t_bits tc16_jmpbuffer;
- #define DEACTIVATEJB(x) \
-   (SCM_SET_CELL_WORD_0 ((x), (SCM_CELL_WORD_0 (x) & ~(1L << 16L))))
- 
--#define JBJMPBUF(OBJ)           ((jmp_buf *) SCM_CELL_WORD_1 (OBJ))
-+#define JBJMPBUF(OBJ)           ((scm_i_jmp_buf *) SCM_CELL_WORD_1 (OBJ))
- #define SETJBJMPBUF(x, v)        (SCM_SET_CELL_WORD_1 ((x), (scm_t_bits) (v)))
- #define SCM_JBDFRAME(x)         ((scm_t_debug_frame *) SCM_CELL_WORD_2 (x))
- #define SCM_SETJBDFRAME(x, v)    (SCM_SET_CELL_WORD_2 ((x), (scm_t_bits) (v)))
-@@ -75,7 +75,7 @@ make_jmpbuf (void)
- {
-   SCM answer;
-   SCM_NEWSMOB2 (answer, tc16_jmpbuffer, 0, 0);
--  SETJBJMPBUF(answer, (jmp_buf *)0);
-+  SETJBJMPBUF(answer, (scm_i_jmp_buf *)0);
-   DEACTIVATEJB(answer);
-   return answer;
- }
-@@ -85,7 +85,7 @@ make_jmpbuf (void)
- 
- struct jmp_buf_and_retval	/* use only on the stack, in scm_catch */
- {
--  jmp_buf buf;			/* must be first */
-+  scm_i_jmp_buf buf;		/* must be first */
-   SCM throw_tag;
-   SCM retval;
- };
-@@ -179,7 +179,7 @@ scm_c_catch (SCM tag,
-   pre_unwind.lazy_catch_p = 0;
-   SCM_SETJBPREUNWIND(jmpbuf, &pre_unwind);
- 
--  if (setjmp (jbr.buf))
-+  if (SCM_I_SETJMP (jbr.buf))
-     {
-       SCM throw_tag;
-       SCM throw_args;
-@@ -821,7 +821,7 @@ scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED)
-       jbr->throw_tag = key;
-       jbr->retval = args;
-       scm_i_set_last_debug_frame (SCM_JBDFRAME (jmpbuf));
--      longjmp (*JBJMPBUF (jmpbuf), 1);
-+      SCM_I_LONGJMP (*JBJMPBUF (jmpbuf), 1);
-     }
- 
-   /* Otherwise, it's some random piece of junk.  */

guile-1.8.7-multilib.patch

@@ -1,45 +0,0 @@
-diff -up guile-1.8.7/libguile/Makefile.in.multilib guile-1.8.7/libguile/Makefile.in
---- guile-1.8.7/libguile/Makefile.in.multilib	2009-07-05 22:25:09.000000000 +0200
-+++ guile-1.8.7/libguile/Makefile.in	2009-07-16 18:07:44.000000000 +0200
-@@ -1717,6 +1717,11 @@ install-nodist_modincludeHEADERS: $(nodi
- 	while read files; do \
- 	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(modincludedir)'"; \
- 	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(modincludedir)" || exit $$?; \
-+	  for f in $$files; do if [ "$$f" = "scmconfig.h" ]; then \
-+ 	    grep -q "SCM_SIZEOF_LONG 4" "$(DESTDIR)$(modincludedir)/$$f" && g=32 || g=64; \
-+ 	    mv "$(DESTDIR)$(modincludedir)/$$f" "$(DESTDIR)$(modincludedir)/scmconfig-$$g.h"; \
-+ 	    $(INSTALL_HEADER) "$${d}scmconfig.h.mlib" "$(DESTDIR)$(modincludedir)/$$f"; \
-+ 	  fi; done \
- 	done
- 
- uninstall-nodist_modincludeHEADERS:
-diff -up guile-1.8.7/libguile/guile-snarf.in.multilib guile-1.8.7/libguile/guile-snarf.in
---- guile-1.8.7/libguile/guile-snarf.in.multilib	2009-07-04 00:19:00.000000000 +0200
-+++ guile-1.8.7/libguile/guile-snarf.in	2009-07-16 18:06:48.000000000 +0200
-@@ -39,7 +39,6 @@
- #   #endif
- # 
- # If the environment variable CPP is set, use its value instead of the
--# C pre-processor determined at Guile configure-time: "@CPP@".
- 
- # Code:
- 
-@@ -75,7 +74,7 @@ tempdir="$TMPDIR/guile-snarf.$$"
- (umask 077 && mkdir $tempdir) || exit 1
- temp="$tempdir/tmp"
- 
--if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
-+if [ x"$CPP" = x ] ; then cpp="gcc -E" ; else cpp="$CPP" ; fi
- 
- trap "rm -rf $tempdir" 0 1 2 15
- 
-diff -up /dev/null guile-1.8.7/libguile/scmconfig.h.mlib
---- /dev/null	2009-06-24 16:43:53.264001725 +0200
-+++ guile-1.8.7/libguile/scmconfig.h.mlib	2009-07-16 18:06:48.000000000 +0200
-@@ -0,0 +1,6 @@
-+#include <bits/wordsize.h>
-+#if __WORDSIZE == 32
-+#include "libguile/scmconfig-32.h"
-+#else
-+#include "libguile/scmconfig-64.h"
-+#endif

guile-1.8.7-testsuite.patch

@@ -1,12 +0,0 @@
-diff -up guile-1.8.7/test-suite/tests/popen.test.testsuite guile-1.8.7/test-suite/tests/popen.test
---- guile-1.8.7/test-suite/tests/popen.test.testsuite	2009-07-04 00:19:00.000000000 +0200
-+++ guile-1.8.7/test-suite/tests/popen.test	2009-07-16 17:09:57.000000000 +0200
-@@ -168,7 +168,7 @@
- 	   (port (with-error-to-port (cdr c2p)
- 		   (lambda ()
- 		     (open-output-pipe
--		      "exec 0</dev/null; while true; do echo closed 1>&2; done")))))
-+		      "exec 0</dev/null; echo closed 1>&2; sleep 3")))))
-       (close-port (cdr c2p))   ;; write side
-       (with-epipe
-        (lambda ()

guile-2.0.14-gc_pkgconfig_private.patch

@@ -0,0 +1,15 @@
+diff -up guile-2.0.14/meta/guile-2.0.pc.in.pkgconfig_private guile-2.0.14/meta/guile-2.0.pc.in
+--- guile-2.0.14/meta/guile-2.0.pc.in.pkgconfig_private	2016-12-14 18:03:33.000000000 -0600
++++ guile-2.0.14/meta/guile-2.0.pc.in	2018-02-20 11:53:56.344379283 -0600
+@@ -21,9 +21,9 @@ guile=${bindir}/@guile@
+ Name: GNU Guile
+ Description: GNU's Ubiquitous Intelligent Language for Extension
+ Version: @GUILE_VERSION@
+-Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @BDW_GC_LIBS@
++Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@
+ Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@	\
+   @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@		\
+   @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@		\
+-  @INET_PTON_LIB@
++  @INET_PTON_LIB@ @BDW_GC_LIBS@
+ Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@

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

guile-ieeetest.patch

@@ -0,0 +1,19 @@
+diff -up guile-2.0.14/test-suite/tests/bytevectors.test.orig guile-2.0.14/test-suite/tests/bytevectors.test
+--- guile-2.0.14/test-suite/tests/bytevectors.test.orig	2018-07-20 10:53:26.644659326 +0200
++++ guile-2.0.14/test-suite/tests/bytevectors.test	2018-07-20 10:52:50.668567335 +0200
+@@ -381,6 +381,7 @@
+       (equal? (bytevector-ieee-single-ref b 0 (endianness little))
+               (bytevector-ieee-single-ref b 4 (endianness big)))))
+ 
++  #!
+   (pass-if "bytevector-ieee-single-{ref,set!} [unaligned]"
+     (let ((b (make-bytevector 9))
+           (number 3.14))
+@@ -388,6 +389,7 @@
+       (bytevector-ieee-single-set! b 5 number (endianness big))
+       (equal? (bytevector-ieee-single-ref b 1 (endianness little))
+               (bytevector-ieee-single-ref b 5 (endianness big)))))
++  !#
+ 
+   (pass-if "double, little endian"
+     ;; http://bugs.gnu.org/11310

guile-multilib.patch

@@ -0,0 +1,47 @@
+diff -up guile-2.0.9/libguile/Makefile.in.multilib guile-2.0.9/libguile/Makefile.in
+--- guile-2.0.9/libguile/Makefile.in.multilib	2013-04-10 01:31:59.000000000 +0200
++++ guile-2.0.9/libguile/Makefile.in	2013-07-16 16:59:59.490527131 +0200
+@@ -3283,6 +3283,11 @@ install-nodist_modincludeHEADERS: $(nodi
+ 	while read files; do \
+ 	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(modincludedir)'"; \
+ 	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(modincludedir)" || exit $$?; \
++	  for f in $$files; do if [ "$$f" = "scmconfig.h" ]; then \
++	    grep -q "SCM_SIZEOF_LONG 4" "$(DESTDIR)$(modincludedir)/$$f" && g=32 || g=64; \
++	    mv "$(DESTDIR)$(modincludedir)/$$f" "$(DESTDIR)$(modincludedir)/scmconfig-$$g.h"; \
++	    $(INSTALL_HEADER) "$${d}scmconfig-multilib.h" "$(DESTDIR)$(modincludedir)/$$f"; \
++	  fi; done \
+ 	done
+ 
+ uninstall-nodist_modincludeHEADERS:
+diff -up guile-2.0.9/libguile/scmconfig-multilib.h.multilib guile-2.0.9/libguile/scmconfig-multilib.h
+--- guile-2.0.9/libguile/scmconfig-multilib.h.multilib	2013-07-16 17:02:26.045733704 +0200
++++ guile-2.0.9/libguile/scmconfig-multilib.h	2013-07-16 17:01:51.623685971 +0200
+@@ -0,0 +1,7 @@
++/* multilib clean wrapper */
++#include <bits/wordsize.h>
++#if __WORDSIZE == 32
++#include "libguile/scmconfig-32.h"
++#else
++#include "libguile/scmconfig-64.h"
++#endif
+diff -up guile-2.0.9/meta/guile-config.in.multilib guile-2.0.9/meta/guile-config.in
+--- guile-2.0.9/meta/guile-config.in.multilib	2012-07-02 11:28:14.000000000 +0200
++++ guile-2.0.9/meta/guile-config.in	2013-07-16 17:09:25.650324597 +0200
+@@ -1,7 +1,6 @@
+ #!/bin/sh
+-PKG_CONFIG_PATH="@pkgconfigdir@:$PKG_CONFIG_PATH"
+ GUILE_AUTO_COMPILE=0
+-export PKG_CONFIG_PATH GUILE_AUTO_COMPILE
++export GUILE_AUTO_COMPILE
+ 
+ exec "@installed_guile@" -e main -s $0 "$@"
+ !#
+@@ -31,7 +30,7 @@ exec "@installed_guile@" -e main -s $0 "
+              (ice-9 rdelim))
+ 
+ 
+-(define %pkg-config-program "@PKG_CONFIG@")
++(define %pkg-config-program "pkg-config")
+ 
+ ;;;; main function, command-line processing
+ 

guile-threadstest.patch

@@ -0,0 +1,11 @@
+diff -up guile-2.0.13/test-suite/tests/threads.test.threadstest guile-2.0.13/test-suite/tests/threads.test
+--- guile-2.0.13/test-suite/tests/threads.test.threadstest	2014-07-04 15:49:51.000000000 +0200
++++ guile-2.0.13/test-suite/tests/threads.test	2017-02-14 08:40:44.920306211 +0100
+@@ -415,6 +415,7 @@
+ 	    (not (mutex-owner m))))
+ 
+         (pass-if "mutex with owner not retained (bug #27450)"
++          (throw 'unresolved)
+           (let ((g (make-guardian)))
+             (g (let ((m (make-mutex))) (lock-mutex m) m))
+ 

guile.spec

@@ -1,26 +1,23 @@
-%bcond_without emacs
-
 Summary: A GNU implementation of Scheme for application extensibility
 Name: guile
-%define mver 1.8
-Version: 1.8.7
-Release: 3%{?dist}
-Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz
-URL: http://www.gnu.org/software/guile/
-Patch1: guile-1.8.7-multilib.patch
-Patch2: guile-1.8.7-testsuite.patch
-Patch3: guile-1.8.7-ia64jmp.patch
-Patch4: guile-1.8.6-deplibs.patch
-License: GPLv2+ and LGPLv2+
-Group: Development/Languages
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool libtool-ltdl-devel gmp-devel readline-devel
-BuildRequires: gettext-devel
-%{?with_emacs:BuildRequires: emacs}
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
-Requires: coreutils
+%define mver 2.0
+Version: 2.0.14
+Release: 17%{?dist}
 Epoch: 5
+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: gettext-devel libunistring-devel libffi-devel gc-devel
+Requires: coreutils
+
+Patch1: guile-multilib.patch
+Patch2: guile-i18ntest.patch
+Patch3: guile-threadstest.patch
+# Avoid linking all guile consumers to libgc
+# TODO: consider using: Requires.private: bdw-gc
+Patch4: guile-2.0.14-gc_pkgconfig_private.patch
+Patch5: guile-ieeetest.patch
 
 %description
 GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
@@ -33,8 +30,7 @@ that you are developing.
 
 %package devel
 Summary: Libraries and header files for the GUILE extensibility library
-Group: Development/Libraries
-Requires: guile = %{epoch}:%{version}-%{release} gmp-devel
+Requires: guile%{?_isa} = %{epoch}:%{version}-%{release} gmp-devel gc-devel
 Requires: pkgconfig
 
 %description devel
@@ -47,41 +43,42 @@ applications that will be linked to GUILE.  You'll also need to
 install the guile package.
 
 %prep
-%setup -q
-
+%setup -q -n guile-%version
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .testsuite
-%patch3 -p1 -b .ia64jmp
-%patch4 -p1 -b .deplibs
+%patch2 -p1 -b .i18ntest
+%patch3 -p1 -b .threadstest
+%patch4 -p1 -b .gc_pkgconfig_private
+%ifarch ppc64le
+%patch5 -p1 -b .ieeetest
+%endif
 
 %build
 
-%ifarch sparcv9
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
-
-# use -O0 on sparcv9
-CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O0|g" `
+# The -O2 option in CFLAGS seems to cause the build to fail on
+# some archs (bug #1675089)
+%ifarch armv7hl ppc64le
+export CFLAGS="$(echo $RPM_OPT_FLAGS | sed 's/-O2/-Os/')"
 %endif
 
 %configure --disable-static --disable-error-on-warning
 
 # Remove RPATH
 sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' \
-    {,guile-readline/}libtool
+    libtool
 
-make %{?_smp_mflags}
+%{make_build}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{make_install}
 
-make DESTDIR=$RPM_BUILD_ROOT install
-
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/guile/site
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/guile/site/%{mver}
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libguile*.la
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
+# Our gdb doesn't support guile yet
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libguile*gdb.scm
+
 # Compress large documentation
 bzip2 NEWS
 
@@ -89,103 +86,245 @@ for i in $RPM_BUILD_ROOT%{_infodir}/goops.info; do
     iconv -f iso8859-1 -t utf-8 < $i > $i.utf8 && mv -f ${i}{.utf8,}
 done
 
-touch $RPM_BUILD_ROOT%{_datadir}/guile/%{mver}/slibcat
-ln -s ../../slib $RPM_BUILD_ROOT%{_datadir}/guile/%{mver}/slib
+touch $RPM_BUILD_ROOT%{_datadir}/guile/site/%{mver}/slibcat
+
+# Create symlinks for compatibility
+ln -s guile $RPM_BUILD_ROOT%{_bindir}/guile2
+ln -s guile-tools $RPM_BUILD_ROOT%{_bindir}/guile2-tools
+
+# Adjust mtimes so they are all identical on all architectures.
+# When guile.x86_64 and guile.i686 are installed at the same time on an x86_64 system,
+# the *.scm files' timestamps change, as they normally reside in /usr/share/guile/.
+# Their corresponding compiled *.go file go to /usr/lib64/, or /usr/lib/, depending on the arch.
+# The mismatch in timestamps between *.scm and *.go files makes guile to compile itself
+# everytime it's run. The following code adjusts the files so that their timestamps are the same
+# for every file, but unique between builds.
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1208760.
+find $RPM_BUILD_ROOT%{_datadir} -name '*.scm' -exec touch -r "%{_specdir}/guile.spec" '{}' \;
+find $RPM_BUILD_ROOT%{_libdir} -name '*.go' -exec touch -r "%{_specdir}/guile.spec" '{}' \;
 
 %check
-%ifarch sparcv9
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
-
-# use -O0 on sparcv9
-CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O0|g" `
-%endif
 make %{?_smp_mflags} check
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%ldconfig_scriptlets
 
-%post
-/sbin/ldconfig
-for i in guile r5rs goops guile-tut; do
-    /sbin/install-info %{_infodir}/$i.info.gz %{_infodir}/dir &> /dev/null
-done
-:
-
-%postun -p /sbin/ldconfig
-
-%preun
-if [ "$1" = 0 ]; then
-    for i in guile r5rs goops guile-tut; do
-        /sbin/install-info --delete %{_infodir}/$i.info.gz \
-            %{_infodir}/dir &> /dev/null
-    done
-fi
-:
-
-%triggerin -- slib
-# Remove files created in guile < 1.8.3-2
-rm -f %{_datadir}/guile/site/slib{,cat}
-
-ln -sfT ../../slib %{_datadir}/guile/%{mver}/slib
-rm -f %{_datadir}/guile/%{mver}/slibcat
+%triggerin -- slib >= 3b4-1
+rm -f %{_datadir}/guile/site/%{mver}/slibcat
 export SCHEME_LIBRARY_PATH=%{_datadir}/slib/
 
 # Build SLIB catalog
-for pre in \
-    "(use-modules (ice-9 slib))" \
-    "(load \"%{_datadir}/slib/guile.init\")"
-do
-    %{_bindir}/guile -c "$pre
-        (set! implementation-vicinity (lambda () \"%{_datadir}/guile/%{mver}/\"))
-        (require 'new-catalog)" &> /dev/null && break
-    rm -f %{_datadir}/guile/%{mver}/slibcat
-done
+%{_bindir}/guile --fresh-auto-compile --no-auto-compile -c \
+    "(use-modules (ice-9 slib)) (require 'new-catalog)" &> /dev/null || \
+    rm -f %{_datadir}/guile/site/%{mver}/slibcat
 :
 
-%triggerun -- slib
+%triggerun -- slib >= 3b4-1
 if [ "$2" = 0 ]; then
-    rm -f %{_datadir}/guile/%{mver}/slib{,cat}
+    rm -f %{_datadir}/guile/site/%{mver}/slibcat
 fi
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING* ChangeLog HACKING NEWS.bz2 README THANKS
+%license COPYING COPYING.LESSER LICENSE
+%doc AUTHORS HACKING NEWS.bz2 README THANKS
+%{_bindir}/guile2
+%{_bindir}/guile2-tools
+%{_bindir}/guild
 %{_bindir}/guile
 %{_bindir}/guile-tools
 %{_libdir}/libguile*.so.*
 %{_libdir}/libguilereadline-*.so
-%{_libdir}/libguile-srfi-srfi-*.so
+%{_libdir}/guile
 %dir %{_datadir}/guile
 %dir %{_datadir}/guile/%{mver}
 %{_datadir}/guile/%{mver}/ice-9
-%{_datadir}/guile/%{mver}/lang
+%{_datadir}/guile/%{mver}/language
 %{_datadir}/guile/%{mver}/oop
+%{_datadir}/guile/%{mver}/rnrs
 %{_datadir}/guile/%{mver}/scripts
 %{_datadir}/guile/%{mver}/srfi
+%{_datadir}/guile/%{mver}/sxml
+%{_datadir}/guile/%{mver}/system
+%{_datadir}/guile/%{mver}/texinfo
+%{_datadir}/guile/%{mver}/web
 %{_datadir}/guile/%{mver}/guile-procedures.txt
-%ghost %{_datadir}/guile/%{mver}/slibcat
-%ghost %{_datadir}/guile/%{mver}/slib
+%{_datadir}/guile/%{mver}/*.scm
 %dir %{_datadir}/guile/site
-%if %{with emacs}
-%dir %{_datadir}/emacs/site-lisp
-%{_datadir}/emacs/site-lisp/*.el
-%endif
+%dir %{_datadir}/guile/site/%{mver}
+%ghost %{_datadir}/guile/site/%{mver}/slibcat
 %{_infodir}/*
 %{_mandir}/man1/guile.1*
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/guile-config
 %{_bindir}/guile-snarf
 %{_datadir}/aclocal/*
-%{_libdir}/libguile.so
+%{_libdir}/libguile-%{mver}.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/guile
-%{_includedir}/libguile
-%{_includedir}/libguile.h
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Feb 19 2019 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.14-16
+- adjust CFLAGS on armv7hl and ppc64le to fix building (#1675089)
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5:2.0.14-15
+- Rebuild for readline 8.0
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 5:2.0.14-13
+- Rebuilt for libcrypt.so.2 (#1666033)
+
+* Fri Jul 20 2018 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.14-12
+- disable failing floating-point test on ppc64le (#1604296)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun 21 2018 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.14-10
+- drop support for upgrading from very old packages
+- drop obsolete install-info scriptlets
+
+* Tue May 22 2018 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.14-9
+- use macros for ldconfig scriptlets
+- add gcc to build requirements
+
+* Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5:2.0.14-8
+- %%check: restore
+
+* Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5:2.0.14-7
+- avoid linking all guile-devel consumers to libgc
+- BR: gcc
+- use %%{make_build},%%{make_install}
+- %%check: make non-fatal
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 5:2.0.14-5
+- Rebuilt for switch to libxcrypt
+
+* Tue Oct 10 2017 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.14-4
+- fix i18n test for new glibc using different thousands separator (#1493170)
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Feb 14 2017 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.14-1
+- update to 2.0.14
+- disable unreliable test in threads.test
+
+* Mon Feb 13 2017 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.13-4
+- fix race condition in 00-repl-server.test (#1412931)
+
+* Wed Feb 01 2017 Stephen Gallagher <sgallagh@redhat.com> - 2.0.13-3
+- Add missing %%license macro
+
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 5:2.0.13-2
+- Rebuild for readline 7.x
+
+* Wed Oct 12 2016 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.13-1
+- update to 2.0.13 (CVE-2016-8605, CVE-2016-8606)
+
+* Fri Jul 15 2016 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.12-1
+- update to 2.0.12
+
+* Sat Mar  5 2016 Peter Robinson <pbrobinson@fedoraproject.org> 5:2.0.11-9
+- Don't ship ChangeLog, NEWS suffices
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.11-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Nov 12 2015 Jan Synáček <jsynacek@redhat.com> - 5:2.0.11-7
+- unify mtime on *.scm and *.go files (#1208760)
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5:2.0.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 5:2.0.11-5
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
+* Tue Sep 02 2014 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.11-4
+- rebuild for new libunistring
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5:2.0.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5:2.0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Mar 21 2014 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.11-1
+- update to 2.0.11
+- switch to xz source tarball
+
+* Wed Mar 19 2014 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.10-1
+- update to 2.0.10
+- update slibcat building for slib 3b4
+- disable auto-compilation when building slibcat
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5:2.0.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul 16 2013 Miroslav Lichvar <mlichvar@redhat.com> - 5:2.0.9-3
+- drop renaming to guile2
+- fix multilib conflicts
+- fix post scriptlet to not remove files on upgrade
+- remove obsolete code from slib trigger
+- fix weekdays in changelog
+
+* Tue Jul 09 2013 Karsten Hopp <karsten@redhat.com> 2.0.9-2
+- bump release and rebuild to fix dependencies on PPC
+
+* Wed Apr 10 2013 Jan Synáček <jsynacek@redhat.com> - 2.0.9-1
+- Update to 2.0.9 (#950357, #925529)
+
+* Fri Jan 25 2013 Jan Synáček <jsynacek@redhat.com> - 2.0.7-1
+- Add forgotten sources
+
+* Fri Jan 25 2013 Jan Synáček <jsynacek@redhat.com> - 2.0.7-1
+- Update to 2.0.7 (#678238)
+
+* Mon Nov 12 2012 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.8-6
+- remove obsolete macros
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5:1.8.8-5.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5:1.8.8-4.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Oct 21 2011 Marcela Mašláňová <mmaslano@redhat.com> - 5:1.8.8-3.2
+- rebuild with new gmp without compat lib
+
+* Tue Oct 11 2011 Peter Schiffer <pschiffe@redhat.com> - 5:1.8.8-3.1
+- rebuild with new gmp
+
+* Thu Jun 16 2011 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.8-3
+- make some libs private in pkgconfig file (#712990)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5:1.8.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Dec 14 2010 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.8-1
+- update to 1.8.8
+- try enabling optimizations on sparc again
+
+* Thu Apr 08 2010 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.7-6
+- fix license tag (#225877)
+
+* Fri Jan 15 2010 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.7-5
+- fix test suite to work with new libtool (#555479)
+
+* Thu Nov 19 2009 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.7-4
+- fix building with new cpp (#538707)
+
 * Tue Sep 22 2009 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.7-3
 - suppress install-info errors (#515977)
 - avoid clash with system setjmp/longjmp on IA64
@@ -455,7 +594,7 @@ fi
 * Wed Aug 22 2001 Philipp Knirsch <pknirsch@redhat.de> 1.3.4-15/2
 - Fixed /tmp buildroot pollution (#50398)
 
-* Mon Jun 12 2001 Florian La Roche <Florian.LaRoche@redhat.de> 1.3.4-14/1
+* Tue Jun 12 2001 Florian La Roche <Florian.LaRoche@redhat.de> 1.3.4-14/1
 - size_t patch from <oliver.paukstadt@millenux.com>
 
 * Fri May 11 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.3.4-13/1
@@ -509,7 +648,7 @@ fi
 * Thu Sep  2 1999 Jeff Johnson <jbj@redhat.com>
 - fix broken %%postun
 
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
 - auto rebuild in the new build environment (release 6)
 
 * Wed Mar 17 1999 Michael Johnson <johnsonm@redhat.com>
@@ -548,7 +687,7 @@ fi
 - added slib link
 
 * Thu Sep 18 1997 Tomasz Koczko <kloczek@idk.com.pl>          (1.2-3)
-- added %%attr(-, root, root) for %%doc, 
+- added %%attr(-, root, root) for %%doc,
 - in %%post, %%postun ldconfig runed as parameter "-p",
 - removed /bin/sh from requires,
 - added %%description,

sources

@@ -1 +1 @@
-991b5b3efcbbc3f7507d05bc42f80a5e  guile-1.8.7.tar.gz
+SHA512 (guile-2.0.14.tar.xz) = 2cad60ab8aa77be44bc4988eaa3a2f0652637f315322abd6011c18f1800c3a461eefa15a14fd54d0d48031b093bc56dfc6cd15dc0a8260b97b40521bff793db6

tests/inventory

@@ -0,0 +1,4 @@
+#!/bin/bash
+#upstream test needs tty
+export TEST_DOCKER_EXTRA_ARGS="-v /dev:/dev --privileged"
+exec merge-standard-inventory "$@"

tests/smoke/Makefile

@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/guile/Sanity/smoke
+#   Description: Guile smoke test
+#   Author: Petr Splichal <psplicha@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/guile/Sanity/smoke
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE fact
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Splichal <psplicha@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Guile smoke test" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          guile" >> $(METADATA)
+	@echo "Requires:        guile" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/smoke/PURPOSE

@@ -0,0 +1,5 @@
+PURPOSE of /CoreOS/guile/Sanity/smoke
+Description: Guile smoke test
+Author: Petr Splichal <psplicha@redhat.com>
+
+Smoke test for the Guile interpreter.

tests/smoke/fact

@@ -0,0 +1,6 @@
+(define (fact n)
+    (if (zero? n) 1
+         (* n (fact (- n 1)))))
+
+(display (fact 12))
+(newline)

tests/smoke/runtest.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/guile/Sanity/smoke
+#   Description: Guile smoke test
+#   Author: Petr Splichal <psplicha@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
+
+PACKAGE="guile"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
+        rlRun "cp fact $TmpDir" 0 "Copying simple guile script"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        # Simple arithmetic
+        rlRun "echo '(+ 1 1 1)' | guile | tee output" 0 "Simple arithmetic"
+        rlAssertGrep "3" "output"
+
+        # String operation
+        rlRun "echo '(string-append \"O\" \"K\")' | guile | tee output" \
+                0 "String operation"
+        rlAssertGrep "OK" "output"
+
+        # Function definition
+        rlRun "guile fact | tee output" 0 "Function definition"
+        rlAssertGrep "479001600" "output"
+
+        # Punifying external script
+        rlRun "guile-tools punify fact | tee output" \
+                0 "Punifying external script"
+        rlAssertGrep "define.*zero.*newline" "output"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd

tests/tests.yml

@@ -0,0 +1,25 @@
+---
+# Tests to run in a classic and container environments
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    - container
+    tests:
+    - smoke
+    - upstream
+    required_packages:
+    - guile
+    - findutils             # beakerlib needs find command
+    - gettext-devel         # upstream needs it
+    - gmp-devel             # upstream needs it
+    - libtool               # upstream needs it
+    - libtool-ltdl-devel    # upstream needs it
+    - readline-devel        # upstream needs it
+    - rpm-build             # upstream needs it
+    - libunistring-devel    # upstream needs it
+    - libffi-devel          # upstream needs it
+    - gc-devel              # upstream needs it
+    - wget                  # rlFetchSrcForInstalled needs it
+

tests/upstream/Makefile

@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/guile/Sanity/upstream
+#   Description: Upstream test suite
+#   Author: Petr Splichal <psplicha@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/guile/Sanity/upstream
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Splichal <psplicha@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Upstream test suite" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        60m" >> $(METADATA)
+	@echo "RunFor:          guile" >> $(METADATA)
+	@echo "Requires:        gettext-devel gmp-devel guile libtool libtool-ltdl-devel readline-devel rpm-build libunistring-devel libffi-devel gc-devel" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/upstream/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/guile/Sanity/upstream
+Description: Upstream test suite
+Author: Petr Splichal <psplicha@redhat.com>

tests/upstream/runtest.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/guile/Sanity/upstream
+#   Description: Upstream test suite
+#   Author: Petr Splichal <psplicha@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
+
+PACKAGE="guile"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+
+        # fetch tests
+        rlRun "rlFetchSrcForInstalled $PACKAGE" 0 "Fetching the source rpm"
+        rlRun "rpm --define '_topdir $TmpDir' -i *src.rpm" \
+                0 "Installing the source rpm"
+        rlRun "mkdir BUILD" 0 "Creating BUILD directory"
+        rlRun "rpmbuild --nodeps --define '_topdir $TmpDir' \
+                -bc $TmpDir/SPECS/*spec" 0 "Preparing sources"
+        rlRun "pushd BUILD/guile*"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "make check" 0 "Dry run of the test suite"
+        rlRun "ln -snf /usr/bin/guile libguile/guile" \
+                0 "Replacing built guile interpreter with system binary"
+        rlRun "pushd test-suite"
+        rlRun "make check" 0 "Running the test suite"
+        rlRun "popd"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd