- updated to 3.0.9

- removed obsolete Fix-non-revealed-port-is-closed-ports.test patch

diff --git a/0007-Fix-non-revealed-port-is-closed-ports.test.patch b/0007-Fix-non-revealed-port-is-closed-ports.test.patch
deleted file mode 100644 (file)
index 03c8454..0000000
--- a/0007-Fix-non-revealed-port-is-closed-ports.test.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bc7facd025cb84e021cf1ec93ad85423e7034dec Mon Sep 17 00:00:00 2001
-From: Rob Browning <rlb@defaultvalue.org>
-Date: Sat, 19 Sep 2020 14:09:04 -0500
-Subject: Fix "non-revealed port is closed" ports.test
-
-Don't close the test port's file descriptor because the port still has a
-reference to it, and could still close it at any time when finally
-garbage collected.  This did soemetimes break subsequent tests.
-
-Bug: https://debbugs.gnu.org/43521
----
- test-suite/tests/ports.test | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/test-suite/tests/ports.test b/test-suite/tests/ports.test
-index cd87640ab..66e10e3dd 100644
---- a/test-suite/tests/ports.test
-+++ b/test-suite/tests/ports.test
-@@ -623,9 +623,10 @@
-         (seek fdes 0 SEEK_CUR)
- 
-         ;; If we get here, it might be because PORT was not GC'd, we
--        ;; don't know (and we can't use a guardian because it would keep
--        ;; PORT alive.)
--        (close-fdes fdes)
-+        ;; don't know, and we can't use a guardian because it would keep
-+        ;; PORT alive, and we can't close the descriptor because
-+        ;; subseuqent opens may re-use it, and then if this port is
-+        ;; garbage collected, it'll close the descriptor unexpectedly.
-         (throw 'unresolved))
-       (lambda args
-         (system-error-errno args)))))

diff --git a/guile.spec b/guile.spec
index fd2a292836f03d2d23adf5f3592f7a09da6bfe51..ab6a7472695d2a20a52895b9429eaeae18204564 100644 (file)
--- a/guile.spec
+++ b/guile.spec
@@ -16,17 +16,16 @@ Summary(pt_BR.UTF-8):       Linguagem de extensão da GNU
 Summary(ru.UTF-8):     Язык расширений GNU
 Summary(uk.UTF-8):     Мова розширень GNU
 Name:          guile
-Version:       3.0.8
+Version:       3.0.9
 Release:       1
 Epoch:         5
 License:       LGPL v3+
 Group:         Development/Languages
 Source0:       https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz
-# Source0-md5: 260ebdd35110a1ce79852ebf0270d309
+# Source0-md5: 258983e0156c2bc66539dcbcb96f2bd2
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-fix_awk_patch.patch
 Patch2:                0006-numbers.test-disable-unresolved-mixed-type-division-.patch
-Patch3:                0007-Fix-non-revealed-port-is-closed-ports.test.patch
 URL:           http://www.gnu.org/software/guile/guile.html
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.12
@@ -47,7 +46,7 @@ BuildRequires:        xz
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      gmp >= 4.2
 Requires:      umb-scheme
-Obsoletes:     libguile9
+Obsoletes:     libguile9 < 5:2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautostrip    .*%{_libdir}/guile/.*\.go
@@ -116,7 +115,7 @@ Requires:   gmp-devel >= 4.2
 Requires:      libffi-devel
 Requires:      libltdl-devel
 Requires:      m4
-Obsoletes:     libguile9-devel
+Obsoletes:     libguile9-devel < 5:2
 
 %description devel
 What's needed to develop apps linked w/ guile
@@ -186,7 +185,6 @@ Tryb edycji guile dla emacsa.
 %ifarch %{ix86}
 %patch2 -p1
 %endif
-%patch3 -p1
 
 # popen test currently fails
 %{__rm} test-suite/tests/popen.test