public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/calibre] rawhide: Update to 9.13.0. Fixes rhbz#2512403
@ 2026-08-16 18:07 Kevin Fenzi
  0 siblings, 0 replies; only message in thread
From: Kevin Fenzi @ 2026-08-16 18:07 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/calibre
            Branch : rawhide
            Commit : a54664d9db1738c402784b8bc74e0c58aa5c79d5
            Author : Kevin Fenzi <kevin@scrye.com>
            Date   : 2026-08-16T11:07:47-07:00
            Stats  : +34/-2 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/calibre/c/a54664d9db1738c402784b8bc74e0c58aa5c79d5?branch=rawhide

            Log:
            Update to 9.13.0. Fixes rhbz#2512403

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

---
diff --git a/.gitignore b/.gitignore
index c2a27f0..32cbc7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -380,3 +380,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-9.9.0.tar.xz
 /calibre-9.11.0.tar.xz
 /calibre-9.12.0.tar.xz
+/calibre-9.13.0.tar.xz

diff --git a/calibre-9.13.0-feedparser-downgrade.patch b/calibre-9.13.0-feedparser-downgrade.patch
new file mode 100644
index 0000000..e455d1e
--- /dev/null
+++ b/calibre-9.13.0-feedparser-downgrade.patch
@@ -0,0 +1,28 @@
+diff --color -Nur calibre-9.13.0.orig/pyproject.toml calibre-9.13.0/pyproject.toml
+--- calibre-9.13.0.orig/pyproject.toml	2026-08-06 18:59:07.000000000 -0700
++++ calibre-9.13.0/pyproject.toml	2026-08-16 09:45:45.430746003 -0700
+@@ -16,8 +16,8 @@
+ 	"jeepney == 0.9.0",
+ 	"dnspython == 2.8.0",
+ 	"mechanize == 0.4.10",
+-	"feedparser-sgmllib == 2.0.1",
+-	"feedparser == 6.0.14",
++	"feedparser == 6.0.12",
++	"sgmllib3k == 1.0.0",
+ 	"Markdown == 3.10.0",
+ 	"html2text == 2025.4.15",
+ 	"soupsieve == 2.8.4",
+diff --color -Nur calibre-9.13.0.orig/src/calibre/test_build.py calibre-9.13.0/src/calibre/test_build.py
+--- calibre-9.13.0.orig/src/calibre/test_build.py	2026-08-16 09:44:56.992366102 -0700
++++ calibre-9.13.0/src/calibre/test_build.py	2026-08-16 09:46:27.364390768 -0700
+@@ -525,7 +525,9 @@
+ 
+     def test_feedparser(self):
+         # sgmllib is needed for feedparser parsing malformed feeds
+-        import feedparser_sgmllib as sgmllib
++        # on python3 you can get it by taking it from python2 stdlib and
++        # running 2to3 on it
++        import sgmllib
+ 
+         from calibre.web.feeds.feedparser import parse  # type: ignore
+ 

diff --git a/calibre.spec b/calibre.spec
index 424a332..6f7628a 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -3,7 +3,7 @@
 %global _python_bytecompile_extra 0
 
 Name:           calibre
-Version:        9.12.0
+Version:        9.13.0
 Release:        %autorelease
 Summary:        E-book converter and library manager
 # see COPYRIGHT file for a listing
@@ -19,6 +19,9 @@ Patch:          calibre-no-update.patch
 # This is so gnome-software only 'sees' calibre once.
 Patch:          calibre-nodisplay.patch
 
+# revert moving to newer python-feedparser until the fedora package updates
+Patch:          calibre-9.13.0-feedparser-downgrade.patch
+
 # fix openssl test
 Patch:          calibre-9.12.0-openssl.patch
 

diff --git a/sources b/sources
index 0ee4f67..9020df7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calibre-9.12.0.tar.xz) = 93c1268ddb659b784010295816ba1406a8a404002fcfe804e098bb1881c86451fced5144504a1d10103c5222dc2943cf53f2743e4dcc1d82406f5c606b58b333
+SHA512 (calibre-9.13.0.tar.xz) = ecea834f1dabd3d870f9a0accc75d30cb357d9de7f5a27fcccda07e6bb7d45664c2c1eeb862e5428cf36a4873467a9d9a065a3e57e937a2495677fb160bfc892

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-16 18:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-16 18:07 [rpms/calibre] rawhide: Update to 9.13.0. Fixes rhbz#2512403 Kevin Fenzi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox