diff --git a/calibre.spec b/calibre.spec index ec559c4..94691a9 100644 --- a/calibre.spec +++ b/calibre.spec @@ -1,12 +1,10 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} %global __provides_exclude_from ^%{_libdir}/%{name}/%{name}/plugins/.*\.so$ Name: calibre Version: 3.27.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: E-book converter and library manager Group: Applications/Multimedia License: GPLv3 @@ -33,22 +31,22 @@ Patch1: %{name}-no-update.patch # Patch3: calibre-nodisplay.patch -BuildRequires: python >= 2.7 -BuildRequires: python-devel >= 2.7 -BuildRequires: python-setuptools -BuildRequires: python-qt5-devel -BuildRequires: python-qt5 -BuildRequires: python-qt5-webkit +BuildRequires: python2 >= 2.7 +BuildRequires: python2-devel >= 2.7 +BuildRequires: python2-setuptools +BuildRequires: python2-qt5-devel +BuildRequires: python2-qt5 +BuildRequires: python2-qt5-webkit BuildRequires: podofo-devel BuildRequires: desktop-file-utils -BuildRequires: python-mechanize -BuildRequires: python-lxml -BuildRequires: python-dateutil -BuildRequires: python-imaging +BuildRequires: python2-mechanize +BuildRequires: python2-lxml +BuildRequires: python2-dateutil +BuildRequires: python2-imaging BuildRequires: xdg-utils -BuildRequires: python-BeautifulSoup +BuildRequires: python2-beautifulsoup BuildRequires: chmlib-devel -BuildRequires: python-cssutils >= 0.9.9 +BuildRequires: python2-cssutils >= 0.9.9 BuildRequires: sqlite-devel BuildRequires: libicu-devel BuildRequires: libpng-devel @@ -63,7 +61,8 @@ BuildRequires: openssl-devel # calibre installer is so smart that it check for the presence of the # directory (and then installs in the wrong place) BuildRequires: bash-completion -BuildRequires: python-apsw +BuildRequires: python2-apsw +BuildRequires: python2-enum34 BuildRequires: glib2-devel BuildRequires: fontconfig-devel BuildRequires: libinput-devel @@ -83,34 +82,35 @@ BuildRequires: libappstream-glib BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -Requires: python-qt5 -Requires: python-qt5-webkit +Requires: python2-qt5 +Requires: python2-qt5-webkit Requires: qt5-qtwebkit Requires: qt5-qtsvg Requires: qt5-qtsensors -Requires: python-cssutils +Requires: python2-cssutils Requires: python2-odfpy -Requires: python-lxml -Requires: python-imaging -Requires: python-mechanize -Requires: python-dateutil -Requires: python-BeautifulSoup +Requires: python2-lxml +Requires: python2-imaging +Requires: python2-mechanize +Requires: python2-dateutil +Requires: python2-beautifulsoup Requires: poppler-utils # Require the packages of the files which are symlinked by calibre Requires: liberation-sans-fonts Requires: liberation-serif-fonts Requires: liberation-mono-fonts -Requires: python-feedparser -Requires: python-netifaces -Requires: python-dns -Requires: python-apsw +Requires: python2-feedparser +Requires: python2-netifaces +Requires: python2-dns +Requires: python2-apsw Requires: mathjax Requires: python2-psutil -Requires: python-pygments +Requires: python2-pygments Requires: optipng Requires: python2-msgpack Requires: python2-regex Requires: python2-html5-parser +Requires: python2-enum34 %description Calibre is meant to be a complete e-library solution. It includes library @@ -146,7 +146,7 @@ chmod -x src/calibre/*/*/*/*.py \ rm -rvf resources/viewer/mathjax %build -OVERRIDE_CFLAGS="%{optflags}" python setup.py build +OVERRIDE_CFLAGS="%{optflags}" %__python2 setup.py build %install mkdir -p %{buildroot}%{_datadir} @@ -162,7 +162,7 @@ mkdir -p %{buildroot}%{_datadir}/desktop-directories # create directory for calibre environment module # the install script assumes it's there. -mkdir -p %{buildroot}%{python_sitelib} +mkdir -p %{buildroot}%{python2_sitelib} # create directory for completion files, so calibre knows where # to install them @@ -172,15 +172,15 @@ mkdir -p %{buildroot}%{_datadir}/zsh/site-functions XDG_DATA_DIRS="%{buildroot}%{_datadir}" \ XDG_UTILS_INSTALL_MODE="system" \ LIBPATH="%{_libdir}" \ -python setup.py install --root=%{buildroot}%{_prefix} \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --staging-libdir=%{buildroot}%{_libdir} \ - --staging-sharedir=%{buildroot}%{_datadir} +%__python2 setup.py install --root=%{buildroot}%{_prefix} \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --staging-libdir=%{buildroot}%{_libdir} \ + --staging-sharedir=%{buildroot}%{_datadir} # remove shebang from init_calibre.py here because # it just got spawned by the install script -sed -i -e '/^#!\//, 1d' %{buildroot}%{python_sitelib}/init_calibre.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{python2_sitelib}/init_calibre.py # icons mkdir -p %{buildroot}%{_datadir}/pixmaps/ @@ -223,11 +223,11 @@ rm -rf %{buildroot}%{_libdir}/%{name}/odf # rm empty feedparser files. rm -rf %{buildroot}%{_libdir}/%{name}/%{name}/web/feeds/feedparser.* -ln -s %{python_sitelib}/feedparser.py \ +ln -s %{python2_sitelib}/feedparser.py \ %{buildroot}%{_libdir}/%{name}/%{name}/web/feeds/feedparser.py -ln -s %{python_sitelib}/feedparser.pyc \ +ln -s %{python2_sitelib}/feedparser.pyc \ %{buildroot}%{_libdir}/%{name}/%{name}/web/feeds/feedparser.pyc -ln -s %{python_sitelib}/feedparser.pyo \ +ln -s %{python2_sitelib}/feedparser.pyo \ %{buildroot}%{_libdir}/%{name}/%{name}/web/feeds/feedparser.pyo # link to system fonts after we have deleted (see Source0) the non-free ones @@ -306,12 +306,15 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/ %{_datadir}/mime/packages/* %{_datadir}/icons/hicolor/*/mimetypes/* %{_datadir}/icons/hicolor/*/apps/* -%{python_sitelib}/init_calibre.py* +%{python2_sitelib}/init_calibre.py* %{_datadir}/bash-completion/completions/%{name} %{_datadir}/zsh/site-functions/_%{name} %{_datadir}/metainfo/*.appdata.xml %changelog +* Thu Jul 26 2018 Zbigniew Jędrzejewski-Szmek - 3.27.1-5 +- Use versioned python macros + * Thu Jul 12 2018 Fedora Release Engineering - 3.27.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild