From ced949ddc060f3fe037da1b73810913fc078ef3b810e231132893a451b1cbd2f Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 4 Dec 2009 11:19:25 +0000
Subject: [PATCH] Accepting request 25492 from devel:languages:misc

Copy from devel:languages:misc/guile based on submit request 25492 from user pgajdos

OBS-URL: https://build.opensuse.org/request/show/25492
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/guile?expand=0&rev=14
---
 guile-1.8.6.tar.bz2    |  3 ---
 guile-1.8.7.tar.bz2    |  3 +++
 guile-popen-test.patch | 12 ++++++++++++
 guile.changes          |  7 +++++++
 guile.spec             | 17 +++++++++--------
 5 files changed, 31 insertions(+), 11 deletions(-)
 delete mode 100644 guile-1.8.6.tar.bz2
 create mode 100644 guile-1.8.7.tar.bz2
 create mode 100644 guile-popen-test.patch

diff --git a/guile-1.8.6.tar.bz2 b/guile-1.8.6.tar.bz2
deleted file mode 100644
index b96183b..0000000
--- a/guile-1.8.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1660a18571722d2ece33cf25f0eb6e6ce087a22876d03fad80c99968c332960f
-size 3132299
diff --git a/guile-1.8.7.tar.bz2 b/guile-1.8.7.tar.bz2
new file mode 100644
index 0000000..baf4225
--- /dev/null
+++ b/guile-1.8.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd58d046243ae7de9d229db6576926d58e717309a7ab04fe0d8a344605e14bbd
+size 3201465
diff --git a/guile-popen-test.patch b/guile-popen-test.patch
new file mode 100644
index 0000000..8226f13
--- /dev/null
+++ b/guile-popen-test.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.changes b/guile.changes
index 680bc06..0bb1dc1 100644
--- a/guile.changes
+++ b/guile.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 30 17:49:57 CET 2009 - pgajdos@suse.cz
+
+- updated to 1.8.7 (see NEWS)
+- fixed testsuite with patch taken from Fedora
+  * popen-test.patch
+
 -------------------------------------------------------------------
 Tue Nov  3 19:09:20 UTC 2009 - coolo@novell.com
 
diff --git a/guile.spec b/guile.spec
index 66097a8..03a0799 100644
--- a/guile.spec
+++ b/guile.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package guile (Version 1.8.6)
+# spec file for package guile (Version 1.8.7)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,18 +18,18 @@
 
 
 Name:           guile
-BuildRequires:  gmp-devel readline-devel
-License:        LGPL v2.1 or later
+BuildRequires:  gc-devel gmp-devel readline-devel
+License:        LGPLv2.1+
 Group:          Development/Languages/Scheme
 AutoReqProv:    on
-Version:        1.8.6
-Release:        2
-%define         GUILEVERSION 1.8
+Version:        1.8.7
+Release:        1
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
 Url:            http://www.gnu.org/software/guile/
 Source0:        %{name}-%{version}.tar.bz2
 Patch1:         %{name}-64bit.patch
 Patch2:         %{name}-1.6.10-mktemp.patch
+Patch3:         %{name}-popen-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         fileutils sh-utils
 PreReq:         %install_info_prereq
@@ -57,7 +57,7 @@ Authors:
     Tom Tromey  <tromey@cygnus.com>
 
 %package devel
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
 Requires:       %{name} = %{version} gmp-devel readline-devel ncurses-devel
@@ -87,6 +87,7 @@ Authors:
 %setup -q
 %patch1
 %patch2
+%patch3 -p1
 # guile-1.8.1: The code is not so good for -Werror (unused results of write()).
 sed -i s/-Werror// configure.in configure
 # force rebuild with non-broken makeinfo
@@ -133,7 +134,7 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
 
 %files
 %defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS COPYING* FAQ ChangeLog GUILE-VERSION HACKING
+%doc ABOUT-NLS AUTHORS COPYING* ChangeLog* GUILE-VERSION HACKING
 %doc LICENSE NEWS README THANKS
 %{_bindir}/*
 %{_datadir}/guile