X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=calibre.spec;h=2e7760bc25cc551a7adc1b271498a1f3e3cc0ec9;hb=389ef12d999f9fe53c5a4e0fa9e5c951e7de4c0a;hp=e43f57a02e4d5de1cea39049df8e66255aa9f754;hpb=adf65ff8c2034fc2ba7a7ca4e401d3f5fdf26607;p=packages%2Fcalibre.git

diff --git a/calibre.spec b/calibre.spec
index e43f57a..2e7760b 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,6 +1,5 @@
 #
-# TODO: - xdg stuff (put desktops and icons in proper place)
-#	- rewrite generate-tarball.sh script to provide locales.zip handling (if needed)
+# TODO: - rewrite generate-tarball.sh script to provide locales.zip handling (if needed)
 #	- make separate server package with init-scripts, etc...
 #
 # NOTE:
@@ -12,56 +11,98 @@
 Summary:	E-book converter and library management
 Summary(pl.UTF-8):	Konwerter oraz biblioteka dla e-booków
 Name:		calibre
-Version:	0.8.28
+Version:	2.47.0
 Release:	1
 License:	GPL v3+
 Group:		Applications/Multimedia
 Source0:	%{name}-%{version}-nofonts.tar.xz
-# Source0-md5:	e8b50d3dfadd83450c9de14f89bd5cbd
+# Source0-md5:	014738246e7fd31cb328fed3a8c296ff
 Source1:	generate-tarball.sh
 Source2:	%{name}-mount-helper
 Patch0:		%{name}-prefix.patch
-Patch1:		%{name}-manpages.patch
-Patch2:		%{name}-no-update.patch
-Patch3:		%{name}-env_module.patch
-Patch4:		%{name}-locales.patch
-Patch5:		shebang-python-fix.patch
+Patch1:		%{name}-no-update.patch
+Patch2:		%{name}-env_module.patch
+Patch3:		%{name}-locales.patch
+Patch4:		shebang-python-fix.patch
+Patch5:		desktop-integration.patch
 URL:		http://www.calibre-ebook.com/
+%define		baeutifulsoup_ver 3.0.5
+%define		pil_ver 1.1.6
+%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
+%define		dateutil_ver 1.4.1
+%define		dns_ver 1.6.0
+%define		lxml_ver 2.2.1
+%define		mechanize_ver 0.1.11
+%define		netifaces_ver 0.8
+%define		psutil_ver 0.6.1
 BuildRequires:	ImageMagick-devel >= 6.6.4.7
-BuildRequires:	chmlib-devel
+BuildRequires:	Qt5Core-devel
+BuildRequires:	Qt5DBus-devel
+BuildRequires:	Qt5Gui-devel
+BuildRequires:	Qt5PlatformSupport-devel
+BuildRequires:	Qt5Widgets-devel
+BuildRequires:	chmlib-devel >= 0.40
 BuildRequires:	libicu-devel
+BuildRequires:	libinput-devel
+BuildRequires:	libmtp-devel >= 1.1.5
+BuildRequires:	libwmf-devel >= 0.2.8
+BuildRequires:	mtdev-devel
 BuildRequires:	pkgconfig
-BuildRequires:	podofo-devel
-BuildRequires:	poppler-Qt-devel
-BuildRequires:	python-BeautifulSoup
-BuildRequires:	python-PIL
-BuildRequires:	python-PyQt4-devel
-BuildRequires:	python-PyQt4-devel-tools
-BuildRequires:	python-cssutils >= 1:0.9.7
-BuildRequires:	python-dateutil
+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:	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}
+BuildRequires:	python-dateutil >= %{dateutil_ver}
 BuildRequires:	python-devel >= 1:2.7.1
-BuildRequires:	python-lxml
-BuildRequires:	python-mechanize
+BuildRequires:	python-dns >= %{dns_ver}
+BuildRequires:	python-genshi
+BuildRequires:	python-lxml >= %{lxml_ver}
+BuildRequires:	python-mechanize >= %{mechanize_ver}
 BuildRequires:	python-modules-sqlite
+BuildRequires:	python-netifaces >= %{netifaces_ver}
+BuildRequires:	python-psutil >= %{psutil_ver}
 BuildRequires:	python-sip-devel
+BuildRequires:	qt5-build
+BuildRequires:	qt5-qmake
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.586
+BuildRequires:	rpmbuild(macros) >= 1.710
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel
+BuildRequires:	sip-PyQt5
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	unzip
 BuildRequires:	xdg-utils
 BuildRequires:	xz >= 1:4.999.7
-Requires:	python-BeautifulSoup
-Requires:	python-PIL
-Requires:	python-PyQt4
-Requires:	python-cssutils
-Requires:	python-dateutil
-Requires:	python-lxml
-Requires:	python-mechanize
+Requires:	Qt5Svg
+Requires:	Qt5WebKit
+Requires:	python-BeautifulSoup >= %{baeutifulsoup_ver}
+Requires:	python-PIL >= %{pil_ver}
+Requires:	python-PyQt5 >= %{pyqt5_ver}
+Requires:	python-apsw >= %{apsw_ver}
+Requires:	python-cssselect >= %{cssselect_ver}
+Requires:	python-cssutils >= %{cssutils_ver}
+Requires:	python-dateutil >= %{dateutil_ver}
+Requires:	python-dns >= %{dns_ver}
+Requires:	python-genshi
+Requires:	python-lxml >= %{lxml_ver}
+Requires:	python-mechanize >= %{mechanize_ver}
 Requires:	python-modules-sqlite
+Requires:	python-netifaces >= %{netifaces_ver}
+Requires:	python-psutil >= %{psutil_ver}
 Suggests:	ImageMagick-coder-jpeg
 Suggests:	ImageMagick-coder-png
+### FIXME: libunrar.so is needed for rar-packed files
+Suggests:	libunrar-devel
 Suggests:	poppler-progs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -98,6 +139,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.
@@ -105,10 +149,23 @@ bash-completion for calibre.
 %description -n bash-completion-calibre -l pl.UTF-8
 Pakiet ten dostarcza bashowe uzupełnianie nazw dla calibre.
 
+%package -n zsh-completion-calibre
+Summary:	zsh-completion for calibre
+Summary(pl.UTF-8):	uzupełnianie nazw dla calibre w powłoce zsh
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion
+
+%description -n zsh-completion-calibre
+zsh-completion for calibre.
+
+%description -n zsh-completion-calibre -l pl.UTF-8
+Pakiet ten dostarcza uzupełnianie nazw dla calibre w powłoce zsh.
+
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1 Patch does not apply, not removed completly since spec update is in progress
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -124,61 +181,94 @@ chmod 755 resources/localization/locales/*
 rm -f resources/localization/locales.zip
 
 %build
-CC=%{__cc} \
+CC="%{__cc}" \
 CXX=%{__cxx} \
 OVERRIDE_CFLAGS="%{rpmcflags}" \
 OVERRIDE_LDFLAGS="%{rpmldflags}" \
+QMAKE="%{_bindir}/qmake-qt5" \
 %{__python} 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}
 
+XDG_DATA_DIRS="$RPM_BUILD_ROOT%{_datadir}" \
+XDG_UTILS_INSTALL_MODE="system" \
+LIBPATH="%{_libdir}" \
 %{__python} setup.py install \
+	--no-compile \
+	--prefix=%{_prefix} \
 	--root=$RPM_BUILD_ROOT \
 	--libdir="%{_libdir}"
 
+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
+
 %py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name}
 %py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
 %py_postclean %{_libdir}/%{name}
 
-# move manpages and locales to proper place
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/man $RPM_BUILD_ROOT%{_mandir}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/localization/locales $RPM_BUILD_ROOT%{_datadir}/locale
+%{__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%{_datadir}/locale/*; do
+for file in $RPM_BUILD_ROOT%{_localedir}/*; do
 	lang=$(echo $file|%{__sed} 's:.*locale/\(.*\).*:\1:')
-	mkdir $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
-	mv $RPM_BUILD_ROOT%{_datadir}/locale/$lang/*.mo \
-	$RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
+	mkdir $RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES
+	mv $RPM_BUILD_ROOT%{_localedir}/$lang/*.mo \
+		$RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES
 done;
-for file in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/messages.mo; do
+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%{_datadir}/locale/$lang/LC_MESSAGES/messages.mo \
-	$RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/%{name}.mo
+	mv $RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/messages.mo \
+		$RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/%{name}.mo
 done;
-for file in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/iso639.mo; do
+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%{_datadir}/locale/$lang/LC_MESSAGES/iso639.mo \
-	$RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/%{name}_iso639.mo
+	mv $RPM_BUILD_ROOT%{_localedir}/$lang/LC_MESSAGES/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%{_datadir}/locale/ltg
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/en_AU
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/bn_BD
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/jv
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ltg
+%{__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
 
+%post
+%update_desktop_database
+%update_mime_database
+%update_icon_cache hicolor
+
+%postun
+if [ $1 -eq 0 ] ; then
+	%update_desktop_database
+	%update_mime_database
+	%update_icon_cache hicolor
+fi
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc Changelog.yaml COPYRIGHT README
+%doc Changelog.yaml COPYRIGHT README.md
 %attr(755,root,root) %{_bindir}/calibre
 %attr(755,root,root) %{_bindir}/calibre-complete
 %attr(755,root,root) %{_bindir}/calibre-customize
@@ -190,20 +280,36 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%attr(755,root,root) %{_bindir}/epub-fix
 %attr(755,root,root) %{_bindir}/fetch-ebook-metadata
 %attr(755,root,root) %{_bindir}/lrf2lrs
 %attr(755,root,root) %{_bindir}/lrfviewer
 %attr(755,root,root) %{_bindir}/lrs2lrf
 %attr(755,root,root) %{_bindir}/markdown-calibre
-%attr(755,root,root) %{_bindir}/pdfmanipulate
 %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}
-%{_mandir}/man1/*.1*
+%{_desktopdir}/calibre-ebook-edit.desktop
+%{_desktopdir}/calibre-ebook-viewer.desktop
+%{_desktopdir}/calibre-gui.desktop
+%{_desktopdir}/calibre-lrfviewer.desktop
+%{_iconsdir}/hicolor/*/*/*.png
+%{_datadir}/mime/application/*.xml
+%{_datadir}/mime/text/*.xml
+%{_datadir}/mime/packages/calibre-mimetypes.xml
+%{_pixmapsdir}/%{name}-gui.png
+%{_pixmapsdir}/calibre-viewer.png
 
 %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)
+%{_datadir}/zsh/site-functions/*