X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=calibre.spec;h=2703b360b7be294d8b05ebc4d4136c4f90af03dc;hb=2efc67903715913927c1a0b08be43b732d61f9e6;hp=076eeb5578c36185af2760fc9741107aaad71bfa;hpb=fe8c5b5e573f1a147cf16711353b7162e06479eb;p=packages%2Fcalibre.git

diff --git a/calibre.spec b/calibre.spec
index 076eeb5..2703b36 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -11,19 +11,19 @@
 Summary:	E-book converter and library management
 Summary(pl.UTF-8):	Konwerter oraz biblioteka dla e-booków
 Name:		calibre
-Version:	4.3.0
-Release:	1
+Version:	5.44.0
+Release:	0.1
 License:	GPL v3+
 Group:		Applications/Multimedia
 Source0:	%{name}-%{version}-nofonts.tar.xz
-# Source0-md5:	8bfe8d70899f3437626d6040be98020a
+# Source0-md5:	7cbc2603d8bebf7c69747282f604092d
 Source1:	generate-tarball.sh
 Source2:	%{name}-mount-helper
 Patch0:		%{name}-prefix.patch
 Patch1:		%{name}-locales.patch
 Patch2:		shebang-python-fix.patch
 Patch3:		desktop-integration.patch
-URL:		http://www.calibre-ebook.com/
+Patch4:		%{name}-env_module.patch
 %define		baeutifulsoup_ver 3.0.5
 %define		pil_ver 1.1.6
 %define		pyqt5_ver 5.3.1
@@ -34,8 +34,10 @@ URL:		http://www.calibre-ebook.com/
 %define		dns_ver 1.6.0
 %define		lxml_ver 2.2.1
 %define		mechanize_ver 0.1.11
+%define		msgpack_ver 1.0.0
 %define		netifaces_ver 0.8
 %define		psutil_ver 0.6.1
+URL:		http://www.calibre-ebook.com/
 BuildRequires:	ImageMagick-devel >= 6.6.4.7
 BuildRequires:	Qt5Core-devel
 BuildRequires:	Qt5DBus-devel
@@ -48,6 +50,7 @@ BuildRequires:	Qt5WebEngine-devel
 BuildRequires:	Qt5Widgets-devel
 BuildRequires:	chmlib-devel >= 0.40
 BuildRequires:	hunspell-devel
+BuildRequires:	hyphen-devel
 BuildRequires:	libicu-devel
 BuildRequires:	libinput-devel
 BuildRequires:	libmtp-devel >= 1.1.5
@@ -55,65 +58,67 @@ BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:	mtdev-devel
 BuildRequires:	pkgconfig
 BuildRequires:	podofo-devel >= 0.8.2
-BuildRequires:	poppler-qt5-devel >= 0.28.1
 BuildRequires:	poppler-glib-devel >= 0.28.1
-BuildRequires:	python-BeautifulSoup >= %{baeutifulsoup_ver}
-BuildRequires:	python-PIL >= %{pil_ver}
-BuildRequires:	python-PyQt5 >= %{pyqt5_ver}
+BuildRequires:	poppler-qt5-devel >= 0.28.1
 BuildRequires:	python-PyQt5-devel-tools >= %{pyqt5_ver}
-BuildRequires:	python-PyQt5-uic >= %{pyqt5_ver}
-BuildRequires:	python-PyQtWebEngine >= %{pyqt5_ver}
-BuildRequires:	python-apsw >= %{apsw_ver}
-BuildRequires:	python-bs4
-BuildRequires:	python-cssselect >= %{cssselect_ver}
-BuildRequires:	python-css_parser
-BuildRequires:	python-cssutils >= %{cssutils_ver}
-BuildRequires:	python-dateutil >= %{dateutil_ver}
-BuildRequires:	python-devel >= 1:2.7.1
-BuildRequires:	python-dns >= %{dns_ver}
-BuildRequires:	python-genshi
-BuildRequires:	python-html5-parser
-BuildRequires:	python-lxml >= %{lxml_ver}
-BuildRequires:	python-mechanize >= %{mechanize_ver}
-BuildRequires:	python-modules-sqlite
-BuildRequires:	python-msgpack
-BuildRequires:	python-netifaces >= %{netifaces_ver}
-BuildRequires:	python-psutil >= %{psutil_ver}
-BuildRequires:	python-regex
-BuildRequires:	python-sip-devel
+#BuildRequires:	python3-BeautifulSoup >= %{baeutifulsoup_ver}
+BuildRequires:	python3-PIL >= %{pil_ver}
+BuildRequires:	python3-PyQt-builder
+BuildRequires:	python3-PyQt5 >= %{pyqt5_ver}
+BuildRequires:	python3-PyQt5-uic >= %{pyqt5_ver}
+BuildRequires:	python3-PyQtWebEngine >= %{pyqt5_ver}
+BuildRequires:	python3-apsw >= %{apsw_ver}
+BuildRequires:	python3-bs4
+BuildRequires:	python3-css_parser
+BuildRequires:	python3-cssselect >= %{cssselect_ver}
+BuildRequires:	python3-cssutils >= %{cssutils_ver}
+BuildRequires:	python3-dateutil >= %{dateutil_ver}
+BuildRequires:	python3-devel >= 1:2.7.1
+BuildRequires:	python3-dns >= %{dns_ver}
+#BuildRequires:	python3-genshi
+BuildRequires:	python3-html5-parser
+BuildRequires:	python3-lxml >= %{lxml_ver}
+#BuildRequires:	python3-mechanize >= %{mechanize_ver}
+#BuildRequires:	python3-modules-sqlite
+BuildRequires:	python3-msgpack >= %{msgpack_ver}
+BuildRequires:	python3-netifaces >= %{netifaces_ver}
+BuildRequires:	python3-psutil >= %{psutil_ver}
+BuildRequires:	python3-regex
+BuildRequires:	python3-sip-devel
 BuildRequires:	qt5-build
 BuildRequires:	qt5-qmake
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.710
 BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel
 BuildRequires:	sip-PyQt5
+BuildRequires:	sqlite3-devel
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	unzip
 BuildRequires:	xdg-utils
 BuildRequires:	xz >= 1:4.999.7
 Requires:	Qt5Svg
 Requires:	Qt5WebKit
-Requires:	python-BeautifulSoup >= %{baeutifulsoup_ver}
-Requires:	python-PIL >= %{pil_ver}
-Requires:	python-PyQt5 >= %{pyqt5_ver}
-Requires:	python-PyQtWebEngine >= %{pyqt5_ver}
-Requires:	python-apsw >= %{apsw_ver}
-Requires:	python-bs4
-Requires:	python-cssselect >= %{cssselect_ver}
-Requires:	python-css_parser
-Requires:	python-cssutils >= %{cssutils_ver}
-Requires:	python-dateutil >= %{dateutil_ver}
-Requires:	python-dns >= %{dns_ver}
-Requires:	python-genshi
-Requires:	python-html5-parser
-Requires:	python-lxml >= %{lxml_ver}
-Requires:	python-mechanize >= %{mechanize_ver}
-Requires:	python-modules-sqlite
-Requires:	python-msgpack
-Requires:	python-netifaces >= %{netifaces_ver}
-Requires:	python-psutil >= %{psutil_ver}
-Requires:	python-regex
+Requires:	Qt5WebEngine
+#Requires:	python3-BeautifulSoup >= %{baeutifulsoup_ver}
+Requires:	python3-PIL >= %{pil_ver}
+Requires:	python3-PyQt5 >= %{pyqt5_ver}
+Requires:	python3-PyQtWebEngine >= %{pyqt5_ver}
+Requires:	python3-apsw >= %{apsw_ver}
+Requires:	python3-bs4
+Requires:	python3-css_parser
+Requires:	python3-cssselect >= %{cssselect_ver}
+Requires:	python3-cssutils >= %{cssutils_ver}
+Requires:	python3-dateutil >= %{dateutil_ver}
+Requires:	python3-dns >= %{dns_ver}
+#Requires:	python3-genshi
+Requires:	python3-html5-parser
+Requires:	python3-lxml >= %{lxml_ver}
+#Requires:	python3-mechanize >= %{mechanize_ver}
+#Requires:	python3-modules-sqlite
+Requires:	python3-msgpack >= %{msgpack_ver}
+Requires:	python3-netifaces >= %{netifaces_ver}
+Requires:	python3-psutil >= %{psutil_ver}
+Requires:	python3-regex
 Suggests:	ImageMagick-coder-jpeg
 Suggests:	ImageMagick-coder-png
 ### FIXME: libunrar.so is needed for rar-packed files
@@ -154,9 +159,7 @@ Summary(pl.UTF-8):	bashowe uzupełnianie nazw dla calibre
 Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
 Requires:	bash-completion
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description -n bash-completion-calibre
 bash-completion for calibre.
@@ -183,6 +186,7 @@ Pakiet ten dostarcza uzupełnianie nazw dla calibre w powłoce zsh.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # 64bit target build fix
 %{__sed} -i -e "s!'/usr/lib'!'%{_libdir}'!g" setup/build_environment.py
@@ -199,18 +203,18 @@ CXX=%{__cxx} \
 OVERRIDE_CFLAGS="%{rpmcflags}" \
 OVERRIDE_LDFLAGS="%{rpmldflags}" \
 QMAKE="%{_bindir}/qmake-qt5" \
-%{__python} setup.py build
+%{__python3} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # create directories for xdg-utils
 install -d $RPM_BUILD_ROOT%{_datadir}/{icons/hicolor,packages,mime/packages,desktop-directories} \
-	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/usr/share/zsh/site-functions}
+$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{zsh_compdir}}
 
 export XDG_DATA_DIRS="$RPM_BUILD_ROOT%{_datadir}"
 export XDG_UTILS_INSTALL_MODE="system"
 export LIBPATH="%{_libdir}"
-%{__python} setup.py install \
+%{__python3} setup.py install \
 	--no-compile \
 	--root=$RPM_BUILD_ROOT \
 	--prefix=%{_prefix} \
@@ -218,7 +222,7 @@ export LIBPATH="%{_libdir}"
 	--libdir=%{_libdir} \
 	--sharedir=%{_datadir}
 
-%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' $RPM_BUILD_ROOT%{_bindir}/*
+%{__sed} -i -e '1s,/usr/bin/env python,%{__python3},' $RPM_BUILD_ROOT%{_bindir}/*
 
 cp -p resources/images/library.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}-gui.png
 cp -p resources/images/viewer.png $RPM_BUILD_ROOT%{_pixmapsdir}/calibre-viewer.png
@@ -251,9 +255,9 @@ done;
 # duplicates of bn,sl
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{bn_BD,sl_SI}
 # unsupported
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{jv,ltg}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{jv,ltg,uz@Latn}
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 
 %find_lang %{name} --all-name
 for file in $RPM_BUILD_ROOT%{_localedir}/*/lcdata.calibre_msgpack; do
@@ -333,4 +337,4 @@ fi
 
 %files -n zsh-completion-calibre
 %defattr(644,root,root,755)
-%{_datadir}/zsh/site-functions/_calibre
+%{zsh_compdir}/_calibre