public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/calibre] f45: Update to 9.15.0. Fixes rhbz#2536890
@ 2026-09-19 21:01 Kevin Fenzi
  0 siblings, 0 replies; only message in thread
From: Kevin Fenzi @ 2026-09-19 21:01 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/calibre
            Branch : f45
            Commit : 75872e8e188745997104e51423b650fa474ef99f
            Author : Kevin Fenzi <kevin@scrye.com>
            Date   : 2026-09-19T13:44:38-07:00
            Stats  : +11/-15 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/calibre/c/75872e8e188745997104e51423b650fa474ef99f?branch=f45

            Log:
            Update to 9.15.0. Fixes rhbz#2536890

Moved to current podofo-devel.
Disabled camoufox test on ppc64le since it doesnt support that arch
Rebased patches

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

---
diff --git a/.gitignore b/.gitignore
index 5a48c4f..d07641c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -382,3 +382,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-9.12.0.tar.xz
 /calibre-9.13.0.tar.xz
 /calibre-9.14.0.tar.xz
+/calibre-9.15.0.tar.xz

diff --git a/calibre-9.13.0-feedparser-downgrade.patch b/calibre-9.13.0-feedparser-downgrade.patch
index e455d1e..0056526 100644
--- a/calibre-9.13.0-feedparser-downgrade.patch
+++ b/calibre-9.13.0-feedparser-downgrade.patch
@@ -1,6 +1,5 @@
-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
+--- calibre-9.15.0.orig/pyproject.toml	2026-09-18 14:14:42.664308309 -0700
++++ calibre-9.15.0/pyproject.toml	2026-09-18 14:15:12.721995119 -0700
 @@ -16,8 +16,8 @@
  	"jeepney == 0.9.0",
  	"dnspython == 2.8.0",
@@ -11,11 +10,10 @@ diff --color -Nur calibre-9.13.0.orig/pyproject.toml calibre-9.13.0/pyproject.to
 +	"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 @@
+ 	"soupsieve == 2.9",
+--- calibre-9.15.0.orig/src/calibre/test_build.py	2026-09-18 14:14:42.573993962 -0700
++++ calibre-9.15.0/src/calibre/test_build.py	2026-09-18 14:15:14.912028547 -0700
+@@ -526,7 +526,9 @@
  
      def test_feedparser(self):
          # sgmllib is needed for feedparser parsing malformed feeds

diff --git a/calibre.spec b/calibre.spec
index e5d5223..b8fb25c 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -3,7 +3,7 @@
 %global _python_bytecompile_extra 0
 
 Name:           calibre
-Version:        9.14.0
+Version:        9.15.0
 Release:        %autorelease
 Summary:        E-book converter and library manager
 # see COPYRIGHT file for a listing
@@ -22,9 +22,6 @@ 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
-
 # use system pycryptodomex instead of the bundled Cryptodome->Crypto redirect
 Patch:          calibre-cryptodome-unbundle.patch
 
@@ -34,7 +31,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-pyqt6-devel
 BuildRequires:  python3-pyqt6
-BuildRequires:  podofo0.10-devel
+BuildRequires:  podofo-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  xdg-utils
 BuildRequires:  chmlib-devel
@@ -377,7 +374,6 @@ TEST_ARGS=(
     --exclude-test-name test_imaging       # WEBP Transparency support ok' not found
     --exclude-test-name test_recipe_browser_qt # Accept-Encoding not found
     --exclude-test-name test_websocket_basic
-
     # fails with python3.13:
     # calibre.srv.tests.loop.LoopTest.test_ssl
     # ssl.SSLCertVerificationError: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: Missing Authority Key Identifier (_ssl.c:1020)
@@ -397,6 +393,7 @@ TEST_ARGS=(
 %ifarch ppc64le
     --exclude-test-name test_fts_pool
     --exclude-test-name test_fts_search
+    --exclude-test-name test_download_deps_camoufox_release_selection # canoufox is only aarc64/x86
 %endif
 )
 

diff --git a/sources b/sources
index 343eedc..22b792f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calibre-9.14.0.tar.xz) = d76a5ea406f8ee878e5ed332bebcf801e328ff26290f711c1bb97e730ad54bd0e9d1827a18e47b2a3c2b003a733af6e53e41bba189238a18bb4fb50658fdac9b
+SHA512 (calibre-9.15.0.tar.xz) = bd1c905541a9298b3c132adfdc9147a65e4925b794fae8addfa79d639fa385da95142229a376d1b81d8cd49dda396461184a3931c9179f5e8740d43b12a4df2f

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

only message in thread, other threads:[~2026-09-19 21:01 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-19 21:01 [rpms/calibre] f45: Update to 9.15.0. Fixes rhbz#2536890 Kevin Fenzi

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