diff --git a/.gitignore b/.gitignore index 9e5833c..64e87e8 100644 --- a/.gitignore +++ b/.gitignore @@ -308,3 +308,4 @@ calibre-0.7.14-nofonts.tar.xz /calibre-4.18.0.tar.xz /test /calibre-4.19.0.tar.xz +/calibre-4.22.0.tar.xz diff --git a/calibre.spec b/calibre.spec index 787bae4..abac6e2 100644 --- a/calibre.spec +++ b/calibre.spec @@ -5,8 +5,8 @@ %global _python_bytecompile_extra 0 Name: calibre -Version: 4.19.0 -Release: 2%{?dist} +Version: 4.22.0 +Release: 1%{?dist} Summary: E-book converter and library manager License: GPLv3 URL: https://calibre-ebook.com/ @@ -16,10 +16,6 @@ Source0: https://download.calibre-ebook.com/%{version}/%{name}-%{version} # Disable auto update from inside the app Patch1: calibre-no-update.patch -# plistlib.Data is dropped in python 3.9, so remove it's use -# https://github.com/kovidgoyal/calibre/pull/1184 -Patch2: calibre-plistlib.patch - # Do not display multiple apps in desktop files, only the main app # This is so gnome-software only 'sees' calibre once. Patch3: calibre-nodisplay.patch @@ -78,7 +74,8 @@ BuildRequires: hunspell-devel BuildRequires: qt5-qtwebengine-devel BuildRequires: python-qt5-webengine BuildRequires: hyphen-devel -BuildRequires: mathjax +# using the bundled mathjax until Fedora updates to 3.0.0 +#BuildRequires: mathjax # Those are only used for tests. Do not add to runtime deps. BuildRequires: /usr/bin/jpegtran BuildRequires: /usr/bin/JxrDecApp @@ -102,7 +99,8 @@ Requires: poppler-utils Requires: liberation-sans-fonts Requires: liberation-serif-fonts Requires: liberation-mono-fonts -Requires: mathjax +# using the bundled mathjax until Fedora updates to 3.0.0 +#Requires: mathjax Requires: optipng Requires: python3dist(odfpy) Requires: python3dist(lxml) @@ -161,15 +159,17 @@ chmod -x src/calibre/*/*/*/*.py \ src/calibre/*/*.py \ src/calibre/*.py +# Using bundled mathjax until fedora goes to 3.0.0 # remove bundled MathJax -rm -rvf resources/mathjax +#rm -rvf resources/mathjax %build # unbundle MathJax -CALIBRE_PY3_PORT=1 \ -%__python3 setup.py mathjax \ - --system-mathjax \ - --path-to-mathjax %{_jsdir}/mathjax/ +# using the bundled mathjax until Fedora updates to 3.0.0 +#CALIBRE_PY3_PORT=1 \ +#%%__python3 setup.py mathjax \ +# --system-mathjax \ +# --path-to-mathjax %%{_jsdir}/mathjax/ OVERRIDE_CFLAGS="%{optflags}" \ CALIBRE_PY3_PORT=1 \ @@ -280,10 +280,10 @@ ln --symbolic --relative \ # Remove these 2 appdata files, we can only include one rm -f %{buildroot}/%{_datadir}/metainfo/calibre-ebook-edit.appdata.xml rm -f %{buildroot}/%{_datadir}/metainfo/calibre-ebook-viewer.appdata.xml - + # rename MathJax folder to allow upgrade from 4.8.0-1 and earlier, which # relied on a symlink handled by the %%preun and %%posttrans scriptlets -mv %{buildroot}%{_datadir}/calibre/mathjax %{buildroot}%{_datadir}/calibre/mathjax-fedora +#mv %%{buildroot}%%{_datadir}/calibre/mathjax %%{buildroot}%%{_datadir}/calibre/mathjax-fedora %check # skip failing tests: @@ -305,8 +305,8 @@ if [ -L %{_datadir}/calibre/mathjax ]; then rm -f %{_datadir}/calibre/mathjax fi -%posttrans -ln -s -r %{_datadir}/calibre/mathjax-fedora %{_datadir}/calibre/mathjax +#posttrans +#ln -s -r %{_datadir}/calibre/mathjax-fedora %{_datadir}/calibre/mathjax %files %license LICENSE @@ -345,6 +345,10 @@ ln -s -r %{_datadir}/calibre/mathjax-fedora %{_datadir}/calibre/mathjax %{_datadir}/metainfo/*.appdata.xml %changelog +* Sun Aug 02 2020 Kevin Fenzi - 4.22.0-1 +- Update to 4.22.0. +- Use bundled mathjax for now until fedora moves to 3.0.0 + * Mon Jul 27 2020 Fedora Release Engineering - 4.19.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 0320f20..aa0ab7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calibre-4.19.0.tar.xz) = 47b767b3f23f01fa1931abd470eb69f5493f5b0e6cd5c0e566b5576d1d831137c28555de3f73ad2a2dd0dd03615171a4c62356278a590ad48b77a6ca1cac890b +SHA512 (calibre-4.22.0.tar.xz) = b9db1c72cf010c25563e3f86a75478ac872249034b3c8b09bb8f0c2519487bb78dea821c9e45564fb645d17431bbee96459a28ee036e57830faedea4cd94b423