diff --git a/.gitignore b/.gitignore index 9d3af0e..f727e06 100644 --- a/.gitignore +++ b/.gitignore @@ -303,3 +303,4 @@ calibre-0.7.14-nofonts.tar.xz /calibre-4.12.0.tar.xz /calibre-4.13.0.tar.xz /calibre-4.15.0.tar.xz +/calibre-4.16.0.tar.xz diff --git a/0001-Fix-test_workers-timeout-response-check-with-Python-.patch b/0001-Fix-test_workers-timeout-response-check-with-Python-.patch deleted file mode 100644 index c1bd7e1..0000000 --- a/0001-Fix-test_workers-timeout-response-check-with-Python-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f99a9421d487214c25418fe856bd531f22625645 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 14 May 2020 11:03:29 -0700 -Subject: [PATCH] Fix test_workers timeout response check with Python 3.5+ - -This check broke with Python 3.5, because REQUEST_TIMEOUT changed -from being simply an integer constant to being an instance of the -new HTTPStatus enum: -https://docs.python.org/3/library/http.html#http.HTTPStatus -on Python 3.5+, `str(http.client.REQUEST_TIMEOUT)` gives -`"HTTPStatus.REQUEST_TIMEOUT"`, not `"408"`. - -Simply comparing as `int` not `unicode_type` should work with all -Pythons (2, 3 before 3.5, and 3.5+). `int(REQUEST_TIMEOUT)` gives -you `408` in all cases. - -This may not have been noticed till now because this check seems -to be a kind of safety valve: it seems that usually, the -`res = conn.getresponse()` call should raise `socket.timeout` -itself, and this is some sort of backstop in case it doesn't. I -caught this in Fedora Rawhide package builds: it seems that on -most arches, we don't hit the bug because `conn.getresponse()` -raises `socket.timeout` directly, but on 32-bit ARM for some -reason we almost always hit this backstop, and that was causing -the test to fail because of this problem. - -Signed-off-by: Adam Williamson ---- - src/calibre/srv/tests/loop.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/calibre/srv/tests/loop.py b/src/calibre/srv/tests/loop.py -index c743f219f8..1ecbca8b3c 100644 ---- a/src/calibre/srv/tests/loop.py -+++ b/src/calibre/srv/tests/loop.py -@@ -93,7 +93,7 @@ class LoopTest(BaseTest): - conn.request('GET', '/') - with self.assertRaises(socket.timeout): - res = conn.getresponse() -- if unicode_type(res.status) == unicode_type(http_client.REQUEST_TIMEOUT): -+ if int(res.status) == int(http_client.REQUEST_TIMEOUT): - raise socket.timeout('Timeout') - raise Exception('Got unexpected response: code: %s %s headers: %r data: %r' % ( - res.status, res.reason, res.getheaders(), res.read())) --- -2.26.2 - diff --git a/calibre.spec b/calibre.spec index 049d997..807b40f 100644 --- a/calibre.spec +++ b/calibre.spec @@ -5,7 +5,7 @@ %global _python_bytecompile_extra 0 Name: calibre -Version: 4.15.0 +Version: 4.16.0 Release: 1%{?dist} Summary: E-book converter and library manager License: GPLv3 @@ -24,9 +24,6 @@ Patch3: calibre-nodisplay.patch # sgml was removed, so disable test for it. Patch5: https://github.com/keszybz/calibre/commit/01bf854923741bf8d6a6328f17d61e0ec5ac3c9f.patch -# fix a test bug which often breaks build on 32-bit ARM -Patch6: 0001-Fix-test_workers-timeout-response-check-with-Python-.patch - ExclusiveArch: %{qt5_qtwebengine_arches} BuildRequires: python3-devel @@ -344,6 +341,9 @@ ln -s -r %{_datadir}/calibre/mathjax-fedora %{_datadir}/calibre/mathjax %{_datadir}/metainfo/*.appdata.xml %changelog +* Sat May 16 2020 Kevin Fenzi - 4.16.0-1 +- Update to 4.16.0. Fixes bug #1836053 + * Thu May 14 2020 Adam Williamson - 4.15.0-1 - New release 4.15.0, should fix #1818600 diff --git a/sources b/sources index 635a093..848843b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calibre-4.15.0.tar.xz) = d06bebe672864b2270a76f097f353aa727a3918d1c87766c9dbad615a6225621bb12d4040c1001415d188b15f1b7c068e77fec7964f4bf26e83ad7f3609bcc04 +SHA512 (calibre-4.16.0.tar.xz) = 96803578c7b609cf146571df38cd9ab75c3fcc6e8b429d7083b4383974161193d544a22c249ad3934c621823a3b1d1bd52e564c6ef70fd4012aae40a1056715b