- update to 1.8.4guile-1_8_4-1_fc9F-9-startF-9-split

- add %%check

7 files changed, 52 insertions, 58 deletions

diff --git a/.cvsignore b/.cvsignore
index f5d8e45..14ac502 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-guile-1.8.3.tar.gz
+guile-1.8.4.tar.gz
diff --git a/guile-1.8.0-rpath.patch b/guile-1.8.0-rpath.patch
deleted file mode 100644
index 6b4157d..0000000
--- a/guile-1.8.0-rpath.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- guile-1.8.0/configure.64bit	2006-02-20 22:29:46.000000000 +0100
-+++ guile-1.8.0/configure	2006-03-10 15:56:40.000000000 +0100
-@@ -9823,7 +9823,7 @@
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
---- guile-1.8.0/guile-readline/configure.64bit	2006-02-20 22:30:25.000000000 +0100
-+++ guile-1.8.0/guile-readline/configure	2006-03-10 15:57:02.000000000 +0100
-@@ -9314,7 +9314,7 @@
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/guile-1.8.3-cr.patch b/guile-1.8.3-cr.patch
deleted file mode 100644
index 8cb33df..0000000
--- a/guile-1.8.3-cr.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: guile-core/libguile/read.c
-===================================================================
-RCS file: /sources/guile/guile/guile-core/libguile/read.c,v
-retrieving revision 1.117.2.7
-retrieving revision 1.117.2.8
-diff -u -r1.117.2.7 -r1.117.2.8
---- guile-core/libguile/read.c	3 Sep 2007 17:04:49 -0000	1.117.2.7
-+++ guile-core/libguile/read.c	17 Oct 2007 22:16:44 -0000	1.117.2.8
-@@ -152,7 +152,7 @@
- /* `isblank' is only in C99.  */
- #define CHAR_IS_BLANK_(_chr)					\
-   (((_chr) == ' ') || ((_chr) == '\t') || ((_chr) == '\n')	\
--   || ((_chr) == '\f'))
-+   || ((_chr) == '\f') || ((_chr) == '\r'))
- 
- #ifdef MSDOS
- # define CHAR_IS_BLANK(_chr)			\
diff --git a/guile-1.8.0-multilib.patch b/guile-1.8.4-multilib.patch
index 3c08022..73fd4d8 100644
--- a/guile-1.8.0-multilib.patch
+++ b/guile-1.8.4-multilib.patch
@@ -1,6 +1,7 @@
---- guile-1.8.0/libguile/Makefile.in.multilib	2006-05-23 14:28:20.000000000 +0200
-+++ guile-1.8.0/libguile/Makefile.in	2006-05-23 15:52:05.000000000 +0200
-@@ -1622,6 +1622,11 @@
+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"; \
@@ -12,8 +13,9 @@
  	done
  
  uninstall-nodist_modincludeHEADERS:
---- guile-1.8.0/libguile/guile-snarf.in.multilib	2006-02-12 14:29:12.000000000 +0100
-+++ guile-1.8.0/libguile/guile-snarf.in	2006-05-23 15:53:23.000000000 +0200
+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
  # 
@@ -22,17 +24,18 @@
  
  # Code:
  
-@@ -72,7 +71,7 @@
- tempdir="/tmp/snarf.$$"
+@@ -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
  
---- guile-1.8.0/libguile/scmconfig.h.mlib.multilib	1970-01-01 01:00:00.000000000 +0100
-+++ guile-1.8.0/libguile/scmconfig.h.mlib	2006-05-23 15:51:30.000000000 +0200
+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
diff --git a/guile-1.8.4-testsuite.patch b/guile-1.8.4-testsuite.patch
new file mode 100644
index 0000000..180c9c8
--- /dev/null
+++ b/guile-1.8.4-testsuite.patch
@@ -0,0 +1,21 @@
+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.spec b/guile.spec
index 02f24ad..fafd521 100644
--- a/guile.spec
+++ b/guile.spec
@@ -1,14 +1,13 @@
 Summary: A GNU implementation of Scheme for application extensibility
 Name: guile
 %define mver 1.8
-Version: 1.8.3
-Release: 3%{?dist}
+Version: 1.8.4
+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.0-rpath.patch
-Patch2: guile-1.8.3-cr.patch
+Patch1: guile-1.8.4-multilib.patch
+Patch2: guile-1.8.4-testsuite.patch
 Patch4: guile-1.8.1-deplibs.patch
-Patch5: guile-1.8.0-multilib.patch
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,15 +42,18 @@ install the guile package.
 
 %prep
 %setup -q
-%patch1 -p1 -b .rpath
-%patch2 -p1 -b .cr
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .testsuite
 %patch4 -p1 -b .deplibs
-%patch5 -p1 -b .multilib
 
 %build
 
 %configure --disable-static --disable-error-on-warning
 
+# Remove RPATH
+sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' \
+    {,guile-readline/}libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -74,6 +76,9 @@ done
 touch $RPM_BUILD_ROOT%{_datadir}/guile/%{mver}/slibcat
 ln -s ../../slib $RPM_BUILD_ROOT%{_datadir}/guile/%{mver}/slib
 
+%check
+make %{?_smp_mflags} check
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -155,6 +160,10 @@ fi
 %{_includedir}/libguile.h
 
 %changelog
+* Thu Feb 21 2008 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.4-1
+- update to 1.8.4
+- add %%check
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5:1.8.3-3
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index 9d05746..06536c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7fd016924e1bc3e273f4009a080942de  guile-1.8.3.tar.gz
+aacc6a384af88a85574717a9221f5c6e  guile-1.8.4.tar.gz