- rebuild with icu 58.2

[packages/calibre.git] / calibre.spec

diff --git a/calibre.spec b/calibre.spec
index bb937aeda94202db0baba6d4470f6a6b6b4020a6..f3cc6abd254347c2f886ce2a762c30dfe6d5c0c1 100644 (file)
--- 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:       2.31.0
-Release:       1
+Version:       2.74.0
+Release:       3
 License:       GPL v3+
 Group:         Applications/Multimedia
 Source0:       %{name}-%{version}-nofonts.tar.xz
-# Source0-md5: b3a96168c3bcd97d5b9f3d5736fe3b64
+# Source0-md5: b01b92dbb654fd64462ce0010e38d24e
 Source1:       generate-tarball.sh
 Source2:       %{name}-mount-helper
 Patch0:                %{name}-prefix.patch
-Patch1:                %{name}-no-update.patch
-Patch2:                %{name}-env_module.patch
-Patch3:                %{name}-locales.patch
-Patch4:                shebang-python-fix.patch
+Patch1:                %{name}-env_module.patch
+Patch2:                %{name}-locales.patch
+Patch3:                shebang-python-fix.patch
+Patch4:                desktop-integration.patch
 URL:           http://www.calibre-ebook.com/
 %define                baeutifulsoup_ver 3.0.5
 %define                pil_ver 1.1.6
@@ -45,6 +45,7 @@ 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
@@ -70,9 +71,10 @@ 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
@@ -81,6 +83,7 @@ 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}
@@ -129,39 +132,39 @@ najnowszych wiadomości z serwisów poświęconym e-książkom. Twórcy
 dołączyli również aplikację, którą użytkownik może wykorzystać jako
 swój własny serwer darmowych książek.
 
-#%package -n bash-completion-calibre
-#Summary:      bash-completion for calibre
-#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
+%package -n bash-completion-calibre
+Summary:       bash-completion for calibre
+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.
+%description -n bash-completion-calibre
+bash-completion for calibre.
 
-#%description -n bash-completion-calibre -l pl.UTF-8
-#Pakiet ten dostarcza bashowe uzupełnianie nazw dla 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
+%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
+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.
+%description -n zsh-completion-calibre -l pl.UTF-8
+Pakiet ten dostarcza uzupełnianie nazw dla calibre w powłoce zsh.
 
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1 Patch does not apply, not removed completly since spec update is in progress
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -193,8 +196,10 @@ 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}"
+       --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
@@ -284,25 +289,25 @@ 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
+%{_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
+%{_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
+%{_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)
-#%{bash_compdir}/calibre
+%files -n bash-completion-calibre
+%defattr(644,root,root,755)
+%{bash_compdir}/calibre
 
-#%files -n zsh-completion-calibre
-#%defattr(644,root,root,755)
-#%{_datadir}/zsh/site-functions/*
+%files -n zsh-completion-calibre
+%defattr(644,root,root,755)
+%{_datadir}/zsh/site-functions/*