- update to 1.8.7guile-1_8_7-1_fc12

7 files changed, 72 insertions, 73 deletions

diff --git a/.cvsignore b/.cvsignore
index 8c1e0e1..e8b1f78 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-guile-1.8.6.tar.gz
+guile-1.8.7.tar.gz
diff --git a/guile-1.8.4-multilib.patch b/guile-1.8.4-multilib.patch
deleted file mode 100644
index 73fd4d8..0000000
--- a/guile-1.8.4-multilib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up guile-1.8.4/libguile/Makefile.in.multilib guile-1.8.4/libguile/Makefile.in
---- guile-1.8.4/libguile/Makefile.in.multilib	2008-02-20 19:34:05.000000000 +0100
-+++ guile-1.8.4/libguile/Makefile.in	2008-02-20 19:34:05.000000000 +0100
-@@ -1630,6 +1630,11 @@ install-nodist_modincludeHEADERS: $(nodi
- 	  f=$(am__strip_dir) \
- 	  echo " $(nodist_modincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(modincludedir)/$$f'"; \
- 	  $(nodist_modincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(modincludedir)/$$f"; \
-+	  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"; \
-+	    $(nodist_modincludeHEADERS_INSTALL) "$${d}scmconfig.h.mlib" "$(DESTDIR)$(modincludedir)/$$f"; \
-+	  fi; \
- 	done
- 
- uninstall-nodist_modincludeHEADERS:
-diff -up guile-1.8.4/libguile/guile-snarf.in.multilib guile-1.8.4/libguile/guile-snarf.in
---- guile-1.8.4/libguile/guile-snarf.in.multilib	2008-02-12 15:04:09.000000000 +0100
-+++ guile-1.8.4/libguile/guile-snarf.in	2008-02-20 19:40:21.000000000 +0100
-@@ -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.4/libguile/scmconfig.h.mlib
---- /dev/null	2007-12-22 10:41:34.485021827 +0100
-+++ guile-1.8.4/libguile/scmconfig.h.mlib	2008-02-20 19:34:05.000000000 +0100
-@@ -0,0 +1,6 @@
-+#include <bits/wordsize.h>
-+#if __WORDSIZE == 32
-+#include "libguile/scmconfig-32.h"
-+#else
-+#include "libguile/scmconfig-64.h"
-+#endif
diff --git a/guile-1.8.4-testsuite.patch b/guile-1.8.4-testsuite.patch
deleted file mode 100644
index 180c9c8..0000000
--- a/guile-1.8.4-testsuite.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up guile-1.8.4/test-suite/tests/popen.test.testsuite guile-1.8.4/test-suite/tests/popen.test
---- guile-1.8.4/test-suite/tests/popen.test.testsuite	2006-08-25 03:21:39.000000000 +0200
-+++ guile-1.8.4/test-suite/tests/popen.test	2008-02-21 10:24:09.000000000 +0100
-@@ -82,7 +82,7 @@
- 	   (port (with-error-to-port (cdr pair)
- 		   (lambda ()
- 		     (open-input-pipe
--		      "exec 1>/dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 999")))))
-+		      "exec 1>/dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 3")))))
-       (close-port (cdr pair))   ;; write side
-       (and (char? (read-char (car pair))) ;; wait for child to do its thing
- 	   (char-ready? port)
-@@ -132,7 +132,7 @@
- 	      (port (with-error-to-port (cdr pair)
- 		      (lambda ()
- 			(open-output-pipe
--			 "exec 0</dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 999")))))
-+			 "exec 0</dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 3")))))
- 	 (close-port (cdr pair))   ;; write side
- 	 (and (char? (read-char (car pair))) ;; wait for child to do its thing
- 	      (catch 'system-error
diff --git a/guile-1.8.7-multilib.patch b/guile-1.8.7-multilib.patch
new file mode 100644
index 0000000..81d441b
--- /dev/null
+++ b/guile-1.8.7-multilib.patch
@@ -0,0 +1,45 @@
+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
diff --git a/guile-1.8.7-testsuite.patch b/guile-1.8.7-testsuite.patch
new file mode 100644
index 0000000..f4d5269
--- /dev/null
+++ b/guile-1.8.7-testsuite.patch
@@ -0,0 +1,12 @@
+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 ()
diff --git a/guile.spec b/guile.spec
index b8b948c..fc28639 100644
--- a/guile.spec
+++ b/guile.spec
@@ -1,18 +1,21 @@
+%bcond_without emacs
+
 Summary: A GNU implementation of Scheme for application extensibility
 Name: guile
 %define mver 1.8
-Version: 1.8.6
-Release: 4%{?dist}
+Version: 1.8.7
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz
 URL: http://www.gnu.org/software/guile/
-Patch1: guile-1.8.4-multilib.patch
-Patch2: guile-1.8.4-testsuite.patch
+Patch1: guile-1.8.7-multilib.patch
+Patch2: guile-1.8.7-testsuite.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 emacs
+BuildRequires: gettext-devel
+%{?with_emacs:BuildRequires: emacs}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: coreutils
@@ -163,8 +166,10 @@ fi
 %ghost %{_datadir}/guile/%{mver}/slibcat
 %ghost %{_datadir}/guile/%{mver}/slib
 %dir %{_datadir}/guile/site
+%if %{with emacs}
 %dir %{_datadir}/emacs/site-lisp
 %{_datadir}/emacs/site-lisp/*.el
+%endif
 %{_infodir}/*
 %{_mandir}/man1/guile.1*
 
@@ -180,6 +185,9 @@ fi
 %{_includedir}/libguile.h
 
 %changelog
+* Thu Jul 16 2009 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.7-1
+- update to 1.8.7
+
 * Tue Jun 09 2009 Dennis Gilmore <dennis@ausil.us> - 5:1.8.6-4
 - build with -O0 on sparcv9 otherwise test suite hangs
 
diff --git a/sources b/sources
index 749e4c4..db2cda0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e23d3dbea0e89bab8a9acc6880150de  guile-1.8.6.tar.gz
+991b5b3efcbbc3f7507d05bc42f80a5e  guile-1.8.7.tar.gz