From dbe222f8bc76046a732189837df3d8985056ff18 Mon Sep 17 00:00:00 2001
From: Automatic Build System <autodist@mambasoft.it>
Date: Fri, 5 Jan 2024 21:05:18 +0100
Subject: [PATCH] automatic version update by autodist [release
 5.16.0-1mamba;Sun Apr 18 2021]

---
 calibre-5.12.0-python-3.7.patch | 13 -------------
 calibre-5.16.0-python-3.7.patch | 12 ++++++++++++
 calibre.spec                    |  9 +++++----
 3 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 calibre-5.12.0-python-3.7.patch
 create mode 100644 calibre-5.16.0-python-3.7.patch

diff --git a/calibre-5.12.0-python-3.7.patch b/calibre-5.12.0-python-3.7.patch
deleted file mode 100644
index 695bd43..0000000
--- a/calibre-5.12.0-python-3.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- calibre-5.12.0/src/calibre/utils/formatter.py.orig	2021-03-06 21:06:44.587932763 +0100
-+++ calibre-5.12.0/src/calibre/utils/formatter.py	2021-03-06 21:07:14.202470086 +0100
-@@ -656,8 +656,8 @@
- 
-     def do_node_first_non_empty(self, prog):
-         for expr in prog.expression_list:
--            if v := self.expr(expr):
--                return v
-+            if self.expr(expr):
-+                return self.expr(expr)
-         return ''
- 
-     def do_node_for(self, prog):
diff --git a/calibre-5.16.0-python-3.7.patch b/calibre-5.16.0-python-3.7.patch
new file mode 100644
index 0000000..17cdc19
--- /dev/null
+++ b/calibre-5.16.0-python-3.7.patch
@@ -0,0 +1,12 @@
+--- calibre-5.16.0/src/calibre/utils/formatter.py.orig	2021-04-18 14:10:24.085338098 +0200
++++ calibre-5.16.0/src/calibre/utils/formatter.py	2021-04-18 14:11:43.765791414 +0200
+@@ -888,7 +888,8 @@
+ 
+     def do_node_first_non_empty(self, prog):
+         for expr in prog.expression_list:
+-            if v := self.expr(expr):
++            v = self.expr(expr)
++            if v:
+                 if (self.break_reporter):
+                     self.break_reporter(prog.node_name, v, prog.line_number)
+                 return v
diff --git a/calibre.spec b/calibre.spec
index 047ca16..5595c8d 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,5 +1,5 @@
 Name:          calibre
-Version:       5.14.0
+Version:       5.16.0
 Release:       1mamba
 Summary:       A free and open source e-book library management application
 Group:         Graphical Desktop/Applications/Multimedia
@@ -14,11 +14,10 @@ Patch1:        calibre-0.7.59-libpoppler-0.18.patch
 Patch2:        calibre-0.7.59-libpng-1.5.patch
 Patch3:        calibre-0.7.50-python-lxml.patch
 Patch4:        calibre-5.10.1-slug-build-fix.patch
-Patch5:        calibre-5.12.0-python-3.7.patch
+Patch5:        calibre-5.16.0-python-3.7.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: ldconfig
 BuildRequires: libGL-devel
 BuildRequires: libfontconfig-devel
 BuildRequires: libfreetype-devel
@@ -35,7 +34,6 @@ BuildRequires: libqt5-devel
 BuildRequires: libstdc++6-devel
 BuildRequires: libusb-devel
 BuildRequires: libz-devel
-BuildRequires: python3
 ## AUTOBUILDREQ-END
 BuildRequires: libpython3-devel
 BuildRequires: libpodofo-devel >= 0.9.3
@@ -215,6 +213,9 @@ install -d %{buildroot}%{_datadir}/zsh/site-functions
 %{python3_sitelib}/init_calibre.py
 
 %changelog
+* Sun Apr 18 2021 Automatic Build System <autodist@mambasoft.it> 5.16.0-1mamba
+- automatic version update by autodist
+
 * Sat Mar 27 2021 Automatic Build System <autodist@mambasoft.it> 5.14.0-1mamba
 - automatic version update by autodist