X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=calibre.spec;h=56f4bb29a173ea0650f8325409c0f32fbc2c6c73;hb=1c3d35d0df58db791675cb1cd5732d38cab6b085;hp=a63d1b12305012a0ee36c7e56fc527b0fa1dd8a0;hpb=292858faa13162e91d816930c7346377b12ada3e;p=packages%2Fcalibre.git

diff --git a/calibre.spec b/calibre.spec
index a63d1b1..56f4bb2 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,7 +1,6 @@
 #
 # TODO: - rewrite generate-tarball.sh script to provide locales.zip handling (if needed)
 #	- make separate server package with init-scripts, etc...
-#	- -locales.patch needs love
 #
 # NOTE:
 # Upstream packages some unfree fonts which we cannot redistribute,
@@ -12,12 +11,12 @@
 Summary:	E-book converter and library management
 Summary(pl.UTF-8):	Konwerter oraz biblioteka dla e-booków
 Name:		calibre
-Version:	1.7.0
+Version:	2.5.0
 Release:	1
 License:	GPL v3+
 Group:		Applications/Multimedia
 Source0:	%{name}-%{version}-nofonts.tar.xz
-# Source0-md5:	7837efa94e247b94b936b2b232efd493
+# Source0-md5:	b2e63ecac0c28b456f17702cc984bdcd
 Source1:	generate-tarball.sh
 Source2:	%{name}-mount-helper
 Patch0:		%{name}-prefix.patch
@@ -25,12 +24,10 @@ Patch1:		%{name}-no-update.patch
 Patch2:		%{name}-env_module.patch
 Patch3:		%{name}-locales.patch
 Patch4:		shebang-python-fix.patch
-Patch5:		imagemagick-6.8.patch
-Patch6:		qt4-private.patch
 URL:		http://www.calibre-ebook.com/
 %define		baeutifulsoup_ver 3.0.5
 %define		pil_ver 1.1.6
-%define		pyqt4_ver 4.9.1
+%define		pyqt5_ver 5.3.1
 %define		apsw_ver 3.8.0.1
 %define		cssselect_ver 0.7.1
 %define		cssutils_ver 1:0.9.9
@@ -41,10 +38,10 @@ URL:		http://www.calibre-ebook.com/
 %define		netifaces_ver 0.8
 %define		psutil_ver 0.6.1
 BuildRequires:	ImageMagick-devel >= 6.6.4.7
-BuildRequires:	QtCore-devel
-BuildRequires:	QtDBus-devel
-BuildRequires:	QtGui-devel
-BuildRequires:	QtSvg-devel
+BuildRequires:	Qt5Core-devel
+BuildRequires:	Qt5DBus-devel
+BuildRequires:	Qt5Gui-devel
+BuildRequires:	Qt5PlatformSupport-devel
 BuildRequires:	chmlib-devel >= 0.40
 BuildRequires:	libicu-devel
 BuildRequires:	libmtp-devel >= 1.1.5
@@ -55,9 +52,10 @@ BuildRequires:	poppler-Qt-devel >= 0.20.2
 BuildRequires:	poppler-glib-devel >= 0.20.2
 BuildRequires:	python-BeautifulSoup >= %{baeutifulsoup_ver}
 BuildRequires:	python-PIL >= %{pil_ver}
-BuildRequires:	python-PyQt4 >= %{pyqt4_ver}
-BuildRequires:	python-PyQt4-devel >= %{pyqt4_ver}
-BuildRequires:	python-PyQt4-devel-tools >= %{pyqt4_ver}
+BuildRequires:	python-PyQt5 >= %{pyqt5_ver}
+BuildRequires:	python-PyQt5-devel >= %{pyqt5_ver}
+BuildRequires:	python-PyQt5-devel-tools >= %{pyqt5_ver}
+BuildRequires:	python-PyQt5-uic >= %{pyqt5_ver}
 BuildRequires:	python-apsw >= %{apsw_ver}
 BuildRequires:	python-cssselect >= %{cssselect_ver}
 BuildRequires:	python-cssutils >= %{cssutils_ver}
@@ -71,7 +69,6 @@ BuildRequires:	python-modules-sqlite
 BuildRequires:	python-netifaces >= %{netifaces_ver}
 BuildRequires:	python-psutil >= %{psutil_ver}
 BuildRequires:	python-sip-devel
-BuildRequires:	qt4-devel-private
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.586
 BuildRequires:	sed >= 4.0
@@ -82,7 +79,7 @@ BuildRequires:	xdg-utils
 BuildRequires:	xz >= 1:4.999.7
 Requires:	python-BeautifulSoup >= %{baeutifulsoup_ver}
 Requires:	python-PIL >= %{pil_ver}
-Requires:	python-PyQt4 >= %{pyqt4_ver}
+Requires:	python-PyQt5 >= %{pyqt5_ver}
 Requires:	python-apsw >= %{apsw_ver}
 Requires:	python-cssselect >= %{cssselect_ver}
 Requires:	python-cssutils >= %{cssutils_ver}
@@ -134,6 +131,9 @@ 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.
@@ -155,14 +155,12 @@ zsh-completion for calibre.
 Pakiet ten dostarcza uzupełnianie nazw dla calibre w powłoce zsh.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 # 64bit target build fix
 %{__sed} -i -e "s!'/usr/lib'!'%{_libdir}'!g" setup/build_environment.py
@@ -200,37 +198,46 @@ cp -p resources/images/viewer.png $RPM_BUILD_ROOT%{_pixmapsdir}/calibre-viewer.p
 %py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
 %py_postclean %{_libdir}/%{name}
 
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/localization/locales $RPM_BUILD_ROOT%{_localedir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/localization/locales $RPM_BUILD_ROOT%{_localedir}
 
 # set proper filenames for locales (TODO: switch to patch if possible)
 for file in $RPM_BUILD_ROOT%{_localedir}/*; do
 	lang=$(echo $file|%{__sed} 's:.*locale/\(.*\).*:\1:')
 	mkdir $RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES
 	mv $RPM_BUILD_ROOT%{_localedir}/$lang/*.mo \
-	$RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES
+		$RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES
 done;
 for file in $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/messages.mo; do
 	lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:')
 	mv $RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/messages.mo \
-	$RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/%{name}.mo
+		$RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/%{name}.mo
 done;
 for file in $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/iso639.mo; do
 	lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:')
 	mv $RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/iso639.mo \
-	$RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/%{name}_iso639.mo
+		$RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/%{name}_iso639.mo
+done;
+for file in $RPM_BUILD_ROOT%{_localedir}/*/lcdata.pickle; do
+	lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/lcdata.pickle:\1:')
+	mv $RPM_BUILD_ROOT%{_localedir}/$lang/lcdata.pickle \
+		$RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/%{name}_lcdata.pickle
 done;
 
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/%{name}-uninstall
 
 # unsupported
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ber
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/jv
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ltg
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/en_AU
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/sl_SI
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 
 %find_lang %{name} --all-name
+for file in $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/%{name}_lcdata.pickle; do
+	lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:')
+	echo $file | %{__sed} "s:$RPM_BUILD_ROOT\(.*\):%lang($lang) \1:" >>%{name}.lang
+done;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -261,6 +268,7 @@ fi
 %attr(755,root,root) %{_bindir}/calibredb
 %attr(755,root,root) %{_bindir}/ebook-convert
 %attr(755,root,root) %{_bindir}/ebook-device
+%attr(755,root,root) %{_bindir}/ebook-edit
 %attr(755,root,root) %{_bindir}/ebook-meta
 %attr(755,root,root) %{_bindir}/ebook-polish
 %attr(755,root,root) %{_bindir}/ebook-viewer
@@ -271,7 +279,11 @@ fi
 %attr(755,root,root) %{_bindir}/markdown-calibre
 %attr(755,root,root) %{_bindir}/web2disk
 %{_datadir}/%{name}
+%{_datadir}/appdata/calibre-ebook-edit.appdata.xml
+%{_datadir}/appdata/calibre-ebook-viewer.appdata.xml
+%{_datadir}/appdata/calibre-gui.appdata.xml
 %{_libdir}/%{name}
+%{_desktopdir}/calibre-ebook-edit.desktop
 %{_desktopdir}/calibre-ebook-viewer.desktop
 %{_desktopdir}/calibre-gui.desktop
 %{_desktopdir}/calibre-lrfviewer.desktop
@@ -284,7 +296,7 @@ fi
 
 %files -n bash-completion-calibre
 %defattr(644,root,root,755)
-%{_sysconfdir}/bash_completion.d/*
+%{bash_compdir}/calibre
 
 %files -n zsh-completion-calibre
 %defattr(644,root,root,755)