fix shebangs for python 3.10; add more -py310 requirements [release 5.43.0-2mamba;Sat Jun 11 2022]

calibre-5.10.1-slug-build-fix.patch

@@ -0,0 +1,11 @@
+--- calibre-5.10.1/setup/translations.py.orig	2021-02-10 10:29:11.518360983 +0100
++++ calibre-5.10.1/setup/translations.py	2021-02-10 10:37:37.017022669 +0100
+@@ -159,7 +159,7 @@
+                             f.seek(0), f.truncate(), f.write('\n'.join(lines).encode('utf-8'))
+                             break
+                     else:
+-                        raise SystemExit(f'Failed to add file_filter for {slug=} to config file')
++                        raise SystemExit(f'Failed to add file_filter for slug= to config file')
+                 self.git('add .tx/config')
+             self.upload_pot(resource=slug)
+             self.git(['add', dest])

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

calibre-5.22.1-python-zeroconf-0.36.7.patch

@@ -0,0 +1,30 @@
+diff --color -Naru a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
+--- a/src/calibre/devices/smart_device_app/driver.py	2021-08-08 08:32:03.104016444 +0200
++++ b/src/calibre/devices/smart_device_app/driver.py	2021-08-08 08:33:30.699018403 +0200
+@@ -2040,13 +2040,6 @@
+ # Function to monkeypatch zeroconf to remove the 15 character name length restriction.
+ # Copied from https://github.com/jstasiak/python-zeroconf version 0.28.1
+ 
+-
+-from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z,
+-                      _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE,
+-                      _HAS_ASCII_CONTROL_CHARS,
+-                      _HAS_ONLY_A_TO_Z_NUM_HYPHEN)
+-
+-
+ def service_type_name(type_: str, *, allow_underscores: bool = False) -> str:
+     """
+     Validate a fully qualified service name, instance or subtype. [rfc6763]
+@@ -2087,6 +2080,12 @@
+     :param type_: Type, SubType or service name to validate
+     :return: fully qualified service name (eg: _http._tcp.local.)
+     """
++
++    from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z,
++                      _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE,
++                      _HAS_ASCII_CONTROL_CHARS,
++                      _HAS_ONLY_A_TO_Z_NUM_HYPHEN)
++
+     if not (type_.endswith('._tcp.local.') or type_.endswith('._udp.local.')):
+         raise BadTypeInNameException("Type '%s' must end with '._tcp.local.' or '._udp.local.'" % type_)
+ 

calibre.spec

@@ -1,92 +1,81 @@
 Name:          calibre
-Version:       4.21.0
-Release:       1mamba
+Version:       5.43.0
+Release:       2mamba
 Summary:       A free and open source e-book library management application
 Group:         Graphical Desktop/Applications/Multimedia
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Ercole 'ercolinux' Carpanetto <ercole69@gmail.com>
-URL:           http://calibre-ebook.com
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           https://calibre-ebook.com
 Source:        https://github.com/kovidgoyal/calibre.git/v%{version}/calibre-%{version}.tar.bz2
-#Source:        http://downloads.sourceforge.net/project/calibre/%{version}/calibre-%{version}.tar.xz
-#Source:        http://calibre-ebook.googlecode.com/files/calibre-%{version}.tar.gz
 Source1:       calibre.desktop
 Patch0:        calibre-0.8.33-libpoppler-0.20.patch
 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.16.0-python-3.7.patch
+Patch6:        calibre-5.22.1-python-zeroconf-0.36.7.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libGL-devel
-BuildRequires: libchm-devel
 BuildRequires: libfontconfig-devel
 BuildRequires: libfreetype-devel
 BuildRequires: libgcc
 BuildRequires: libglib-devel
+BuildRequires: libglvnd-devel
+BuildRequires: libhunspell-devel
+BuildRequires: libhyphen-devel
 BuildRequires: libicu-devel
 BuildRequires: libmtp-devel
 BuildRequires: libopenssl-devel
 BuildRequires: libpodofo-devel
-BuildRequires: libpython3-devel
-BuildRequires: libqt5-devel
+BuildRequires: libpython310-devel
 BuildRequires: libstdc++6-devel
+BuildRequires: libstemmer-devel
 BuildRequires: libusb-devel
 BuildRequires: libz-devel
+BuildRequires: qt5-qtbase-devel
 ## AUTOBUILDREQ-END
-BuildRequires: libpython3-devel
+BuildRequires: libpython310-devel
 BuildRequires: libpodofo-devel >= 0.9.3
 BuildRequires: libwmf-devel
-#BuildRequires: BeautifulSoup
-#BuildRequires: dnspython
-BuildRequires: python-apsw-py3
-BuildRequires: python-beautifulsoup4-py3
-#BuildRequires: python-cssutils
-BuildRequires: python-cssselect-py3
-BuildRequires: python-css-parser-py3
-BuildRequires: python-dateutil-py3
-#BuildRequires: python-dukpy
-BuildRequires: python-feedparser-py3
-BuildRequires: python-html5lib-py3
-BuildRequires: python-html5-parser-py3
-BuildRequires: python-lxml-py3
-BuildRequires: python-mechanize-py3
-BuildRequires: python-msgpack-py3
-BuildRequires: python-ordereddict
-BuildRequires: python-regex-py3
-BuildRequires: python-sip-py3
-BuildRequires: python-six-py3
-BuildRequires: python-soupsieve-py3
-BuildRequires: python-webencodings-py3
-#BuildRequires: pyicu
+BuildRequires: python-apsw-py310
+BuildRequires: python-beautifulsoup4-py310
+BuildRequires: python-css-parser-py310
+BuildRequires: python-dateutil-py310
+BuildRequires: python-html5lib-py310
+BuildRequires: python-html5-parser-py310
+BuildRequires: python-lxml-py310
+BuildRequires: python-mechanize-py310
+BuildRequires: python-msgpack-py310
+BuildRequires: python-regex-py310
+BuildRequires: python-sip-py310
+BuildRequires: python-six-py310
+BuildRequires: python-soupsieve-py310
+BuildRequires: python-webencodings-py310
 BuildRequires: PyQt5-devel
-BuildRequires: PyQt5-py3
-BuildRequires: pyqtwebengine-py3
-Requires:      PyQt5-py3 >= 5.13.0
-Requires:      pyqtwebengine-py3 >= 5.13.0
-Requires:      python3 >= %python3_version
-#Requires:      BeautifulSoup
-#Requires:      pyicu
-Requires:      python-apsw-py3
-Requires:      python-beautifulsoup4-py3
-#Requires:      python-chardet
-Requires:      python-cssselect-py3
-#Requires:      python-cssutils-py3
-Requires:      python-css-parser-py3
-Requires:      python-dateutil-py3
-#Requires:      python-dukpy
-Requires:      python-feedparser-py3
-Requires:      python-html5lib-py3
-Requires:      python-html5-parser-py3
-Requires:      python-lxml-py3
-Requires:      python-mechanize-py3
-Requires:      python-msgpack-py3
-Requires:      python-netifaces-py3
-Requires:      python-regex-py3
-Requires:	   python-six-py3
-Requires:      python-soupsieve-py3
-Requires:      python-webencodings-py3
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+BuildRequires: PyQt5-py310
+BuildRequires: pyqtwebengine-py310
+BuildRequires: PyQt-builder-py310
+Requires:      PyQt5-py3 >= 5.15.2
+Requires:      pyqtwebengine-py310 >= 5.13.0
+Requires:      python310
+Requires:      python-apsw-py310
+Requires:      python-beautifulsoup4-py310
+Requires:      python-css-parser-py310
+Requires:      python-dateutil-py310
+Requires:      python-html5lib-py310
+Requires:      python-html5-parser-py310
+Requires:      python-lxml-py310
+Requires:      python-mechanize-py310
+Requires:      python-msgpack-py310
+Requires:      python-Pillow-py310
+Requires:      python-regex-py310
+Requires:	   python-six-py310
+Requires:      python-soupsieve-py310
+Requires:      python-webencodings-py310
+Requires:      liberation-fonts-ttf
 
 %description
 calibre is a free and open source e-book library management application developed by users of e-books for users of e-books.
@@ -94,6 +83,14 @@ calibre is a free and open source e-book library management application develope
 %prep
 %setup -q
 #-D -T
+#:<< _EOF
+#%patch5 -p1
+#%patch6 -p1
+# Use uppercase naming scheme, don't delete config files under fakeroot.
+sed -e "/import config_dir/,/os.rmdir(config_dir)/d" \
+    -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \
+    -e "s/^Name=calibre/Name=Calibre/g" \
+    -i  src/calibre/linux.py
 
 %build
 #:<< _EOF
@@ -101,17 +98,25 @@ calibre is a free and open source e-book library management application develope
 export QTWEBENGINE_DISABLE_SANDBOX=1
 %endif
 
-CALIBRE_PY3_PORT=1 CFLAGS="%{optflags}" %{__python3} setup.py bootstrap
-CALIBRE_PY3_PORT=1 CFLAGS="%{optflags}" %{__python3} setup.py build
-CALIBRE_PY3_PORT=1 CFLAGS="%{optflags}" %{__python3} setup.py resources
+CFLAGS="%{optflags}" %{__python310} setup.py bootstrap
+LANG='en_US.UTF-8' %{__python310} setup.py build
+LANG='en_US.UTF-8' %{__python310} setup.py gui
+%{__python310} setup.py liberation_fonts --path-to-liberation_fonts /usr/share/fonts/liberation --system-liberation_fonts
+LANG='en_US.UTF-8' %{__python310} setup.py resources
+LANG='en_US.UTF-8' %{__python310} setup.py rapydscript
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-CALIBRE_PY3_PORT=1 %{__python3} setup.py install \
+# If this directory doesn't exist, zsh completion won't install.
+install -d %{buildroot}%{_datadir}/zsh/site-functions
+
+%{__python310} setup.py install \
    --root=%{buildroot}/usr  \
    --staging-libdir=%{buildroot}%{_libdir} \
    --libdir=%{_libdir}
 
+sed -i "s|bin/env python3$|bin/env python3.10|" %{buildroot}%{_bindir}/*
+
 %files 
 %defattr(-,root,root)
 %{_bindir}/calibre
@@ -129,66 +134,68 @@ CALIBRE_PY3_PORT=1 %{__python3} setup.py install \
 %{_datadir}/mime/packages/calibre-mimetypes.xml
 %{_datadir}/bash-completion/completions/*
 %dir %{_libdir}/calibre
-%dir %{_libdir}/calibre/backports
-%{_libdir}/calibre/backports/*
-%dir %{_libdir}/calibre/biplist
-%{_libdir}/calibre/biplist/*
-%dir %{_libdir}/calibre/calibre
-%{_libdir}/calibre/calibre/*.py
-%dir %{_libdir}/calibre/calibre/db
-%{_libdir}/calibre/calibre/db/*
-%dir %{_libdir}/calibre/calibre/customize
-%{_libdir}/calibre/calibre/customize/*.py
-%dir %{_libdir}/calibre/calibre/devices
-%{_libdir}/calibre/calibre/devices/*
-%dir %{_libdir}/calibre/calibre/ebooks
-%{_libdir}/calibre/calibre/ebooks/*
-%dir %{_libdir}/calibre/calibre/gui2
-%{_libdir}/calibre/calibre/gui2/*
-%dir %{_libdir}/calibre/calibre/library
-%{_libdir}/calibre/calibre/library/*
-%dir %{_libdir}/calibre/calibre/plugins
-%dir %{_libdir}/calibre/calibre/plugins/3
-%{_libdir}/calibre/calibre/plugins/3/*
-%dir %{_libdir}/calibre/calibre/srv
-%{_libdir}/calibre/calibre/srv/*.py
-%dir %{_libdir}/calibre/calibre/srv/tests
-%{_libdir}/calibre/calibre/srv/tests/*.py
-%dir %{_libdir}/calibre/calibre_lzma
-%{_libdir}/calibre/calibre_lzma/*
-%dir %{_libdir}/calibre/calibre/plugins
-#%{_libdir}/calibre/calibre/plugins/*.so
-%dir %{_libdir}/calibre/calibre/spell
-%{_libdir}/calibre/calibre/spell/*.py
-%dir %{_libdir}/calibre/calibre/translations
-%{_libdir}/calibre/calibre/translations/*.py
-%dir %{_libdir}/calibre/calibre/utils
-%{_libdir}/calibre/calibre/utils/*
-%dir %{_libdir}/calibre/calibre/web
-%{_libdir}/calibre/calibre/web/*
-%dir %{_libdir}/calibre/css_selectors
-%{_libdir}/calibre/css_selectors/*
-#%dir %{_libdir}/calibre/duktape
-#%{_libdir}/calibre/duktape/*
-%dir %{_libdir}/calibre/odf
-%{_libdir}/calibre/odf/*.py
-%dir %{_libdir}/calibre/polyglot
-%{_libdir}/calibre/polyglot/*
-%dir %{_libdir}/calibre/templite
-%{_libdir}/calibre/templite/*.py
-%dir %{_libdir}/calibre/tinycss/
-%{_libdir}/calibre/tinycss/*.py
-%dir %{_libdir}/calibre/tinycss/tests
-%{_libdir}/calibre/tinycss/tests/*.py
+%{_libdir}/calibre/*
 %dir %{_datadir}/calibre
 %{_datadir}/calibre/*
+%{_datadir}/zsh/site-functions/_calibre
 %{_datadir}/icons/hicolor/*/apps/calibre-*.png
 %{_datadir}/icons/hicolor/*/mimetypes/application-*.png
 %{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-*.png
 %{_datadir}/icons/hicolor/*/mimetypes/text-lrs.png
-%{python3_sitelib}/init_calibre.py
+%{python310_sitearch}/init_calibre.py
 
 %changelog
+* Sat Jun 11 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 5.43.0-2mamba
+- fix shebangs for python 3.10; add more -py310 requirements
+
+* Fri Jun 03 2022 Automatic Build System <autodist@mambasoft.it> 5.43.0-1mamba
+- automatic version update by autodist
+
+* Tue Oct 05 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.22.1-2mamba
+- added patch against python-zeroconf 0.36.7
+
+* Sat Jun 26 2021 Automatic Build System <autodist@mambasoft.it> 5.22.1-1mamba
+- automatic version update by autodist
+
+* Fri Jun 25 2021 Automatic Build System <autodist@mambasoft.it> 5.22.0-1mamba
+- automatic version update by autodist
+
+* Fri Jun 11 2021 Automatic Build System <autodist@mambasoft.it> 5.21.0-1mamba
+- automatic version update by autodist
+
+* Fri Jun 04 2021 Automatic Build System <autodist@mambasoft.it> 5.20.0-1mamba
+- automatic version update by autodist
+
+* Fri May 28 2021 Automatic Build System <autodist@mambasoft.it> 5.19.0-1mamba
+- automatic version update by autodist
+
+* Fri May 21 2021 Automatic Build System <autodist@mambasoft.it> 5.18.0-1mamba
+- automatic version update by autodist
+
+* Fri Apr 30 2021 Automatic Build System <autodist@mambasoft.it> 5.17.0-1mamba
+- automatic version update by autodist
+
+* Mon Apr 19 2021 Automatic Build System <autodist@mambasoft.it> 5.16.1-1mamba
+- automatic version update by autodist
+
+* 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
+
+* Sat Mar 13 2021 Automatic Build System <autodist@mambasoft.it> 5.13.0-1mamba
+- automatic version update by autodist
+
+* Sat Mar 06 2021 Automatic Build System <autodist@mambasoft.it> 5.12.0-1mamba
+- automatic version update by autodist
+
+* Fri Aug 21 2020 Automatic Build System <autodist@mambasoft.it> 4.23.0-1mamba
+- automatic version update by autodist
+
+* Fri Jul 31 2020 Automatic Build System <autodist@mambasoft.it> 4.22.0-1mamba
+- automatic version update by autodist
+
 * Fri Jul 17 2020 Automatic Build System <autodist@mambasoft.it> 4.21.0-1mamba
 - automatic version update by autodist