rpms/guile/devel guile-1.8.7-multilib.patch, NONE, 1.1 guile-1.8.7-testsuite.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 guile.spec, 1.64, 1.65 sources, 1.17, 1.18 guile-1.8.4-multilib.patch, 1.1, NONE guile-1.8.4-testsuite.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/guile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4809

Modified Files:
	.cvsignore guile.spec sources 
Added Files:
	guile-1.8.7-multilib.patch guile-1.8.7-testsuite.patch 
Removed Files:
	guile-1.8.4-multilib.patch guile-1.8.4-testsuite.patch 
Log Message:
- update to 1.8.7


guile-1.8.7-multilib.patch:

--- NEW FILE guile-1.8.7-multilib.patch ---
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:

--- NEW FILE guile-1.8.7-testsuite.patch ---
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 ()


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	9 Dec 2008 12:12:42 -0000	1.17
+++ .cvsignore	16 Jul 2009 16:39:44 -0000	1.18
@@ -1 +1 @@
-guile-1.8.6.tar.gz
+guile-1.8.7.tar.gz


Index: guile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/guile.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- guile.spec	9 Jun 2009 22:23:38 -0000	1.64
+++ guile.spec	16 Jul 2009 16:39:44 -0000	1.65
@@ -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 at redhat.com> - 5:1.8.7-1
+- update to 1.8.7
+
 * Tue Jun 09 2009 Dennis Gilmore <dennis at ausil.us> - 5:1.8.6-4
 - build with -O0 on sparcv9 otherwise test suite hangs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	9 Dec 2008 12:12:42 -0000	1.17
+++ sources	16 Jul 2009 16:39:44 -0000	1.18
@@ -1 +1 @@
-9e23d3dbea0e89bab8a9acc6880150de  guile-1.8.6.tar.gz
+991b5b3efcbbc3f7507d05bc42f80a5e  guile-1.8.7.tar.gz


--- guile-1.8.4-multilib.patch DELETED ---


--- guile-1.8.4-testsuite.patch DELETED ---