From 2ebe82171bd13206da5fcb84e70557d14583ac52 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 21:05:17 +0100 Subject: [PATCH] fix python3 build [release 4.13.0-3mamba;Mon Apr 13 2020] --- calibre.spec | 140 ++++++++++++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 68 deletions(-) diff --git a/calibre.spec b/calibre.spec index 6e46d4e..6ee1101 100644 --- a/calibre.spec +++ b/calibre.spec @@ -1,6 +1,6 @@ Name: calibre Version: 4.13.0 -Release: 1mamba +Release: 3mamba Summary: A free and open source e-book library management application Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba @@ -28,64 +28,64 @@ BuildRequires: libicu-devel BuildRequires: libmtp-devel BuildRequires: libopenssl-devel BuildRequires: libpodofo-devel -BuildRequires: libpython-devel -BuildRequires: libpython27-devel +BuildRequires: libpython3-devel BuildRequires: libqt5-devel BuildRequires: libstdc++6-devel BuildRequires: libusb-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END -BuildRequires: BeautifulSoup -BuildRequires: dnspython -BuildRequires: libwmf -BuildRequires: python-mechanize -BuildRequires: python-cssutils -BuildRequires: python-lxml -BuildRequires: libpython-devel -BuildRequires: python-sip-devel -BuildRequires: python-ordereddict -BuildRequires: python-cssselect -BuildRequires: libmtp-devel -BuildRequires: python-dateutil +BuildRequires: libpython3-devel BuildRequires: libpodofo-devel >= 0.9.3 -BuildRequires: python-dukpy -BuildRequires: python-html5-parser -BuildRequires: pyicu +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: PyQt5-devel -BuildRequires: pyqtwebengine -BuildRequires: python-webencodings -BuildRequires: python-regex -BuildRequires: python-msgpack -BuildRequires: python-feedparser -BuildRequires: python-css-parser -BuildRequires: python-beautifulsoup4 -BuildRequires: python-apsw -BuildRequires: python-soupsieve -Requires: PyQt5 >= 5.13.0 -Requires: pyqtwebengine >= 5.13.0 -Requires: python-lxml -Requires: python-six -Requires: python-apsw -Requires: cssutils -Requires: mechanize -Requires: python27 >= %python27_version -Requires: python-cssselect -Requires: python-dateutil -Requires: BeautifulSoup -Requires: python-netifaces -Requires: pyicu -Requires: python-dukpy -Requires: python-html5-parser -Requires: python-webencodings -Requires: python-regex -Requires: python-chardet -Requires: python-html5lib -Requires: python-msgpack -Requires: python-feedparser -Requires: python-css-parser -Requires: python-beautifulsoup4 -Requires: python-apsw -Requires: python-soupsieve +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 %description @@ -101,22 +101,17 @@ calibre is a free and open source e-book library management application develope export QTWEBENGINE_DISABLE_SANDBOX=1 %endif -CFLAGS="%{optflags}" %{__python27} setup.py bootstrap -CFLAGS="%{optflags}" %{__python27} setup.py build -CFLAGS="%{optflags}" %{__python27} setup.py resources +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 %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%{__python27} setup.py install \ +CALIBRE_PY3_PORT=1 %{__python3} setup.py install \ --root=%{buildroot}/usr \ --staging-libdir=%{buildroot}%{_libdir} \ --libdir=%{_libdir} -#mkdir %{buildroot}%{_datadir}/applications -#cp %SOURCE1 %{buildroot}%{_datadir}/applications/calibre.desktop -#install -D -m0644 %{buildroot}%{_datadir}/calibre/content-server/calibre.png \ -# %{buildroot}%{_datadir}/pixmaps/calibre.png - %files %defattr(-,root,root) %{_bindir}/calibre @@ -134,9 +129,9 @@ CFLAGS="%{optflags}" %{__python27} setup.py resources %{_datadir}/mime/packages/calibre-mimetypes.xml %{_datadir}/bash-completion/completions/* %dir %{_libdir}/calibre -%dir %{_libdir}/calibre/calibre %dir %{_libdir}/calibre/backports %{_libdir}/calibre/backports/* +%dir %{_libdir}/calibre/calibre %{_libdir}/calibre/calibre/*.py %dir %{_libdir}/calibre/calibre/db %{_libdir}/calibre/calibre/db/* @@ -150,10 +145,17 @@ CFLAGS="%{optflags}" %{__python27} setup.py resources %{_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 +#%{_libdir}/calibre/calibre/plugins/*.so %dir %{_libdir}/calibre/calibre/spell %{_libdir}/calibre/calibre/spell/*.py %dir %{_libdir}/calibre/calibre/translations @@ -170,10 +172,6 @@ CFLAGS="%{optflags}" %{__python27} setup.py resources %{_libdir}/calibre/odf/*.py %dir %{_libdir}/calibre/polyglot %{_libdir}/calibre/polyglot/* -%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/templite %{_libdir}/calibre/templite/*.py %dir %{_libdir}/calibre/tinycss/ @@ -186,9 +184,15 @@ CFLAGS="%{optflags}" %{__python27} setup.py resources %{_datadir}/icons/hicolor/*/mimetypes/application-*.png %{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-*.png %{_datadir}/icons/hicolor/*/mimetypes/text-lrs.png -%{python27_sitelib}/init_calibre.py +%{python3_sitelib}/init_calibre.py %changelog +* Mon Apr 13 2020 Silvan Calarco 4.13.0-3mamba +- fix python3 build + +* Sat Apr 11 2020 Silvan Calarco 4.13.0-2mamba +- python3 rebuild + * Mon Mar 30 2020 Automatic Build System 4.13.0-1mamba - automatic version update by autodist