diff --git a/.gitignore b/.gitignore index eb64fac..92572c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.build-*.log +/calibre-*.src.rpm calibre-0.7.10-nofonts.tar.xz calibre-0.7.11-nofonts.tar.xz calibre-0.7.12-nofonts.tar.xz @@ -223,3 +225,8 @@ calibre-0.7.14-nofonts.tar.xz /calibre-2.46.0-nofonts.tar.xz /calibre-2.48.0-nofonts.tar.xz /calibre-2.49.0-nofonts.tar.xz +/calibre-2.50.1-nofonts.tar.xz +/calibre-2.51.0-nofonts.tar.xz +/calibre-2.52.0.tar.xz +/calibre-2.52.0-nofonts.tar.xz +/calibre-2.53.0-nofonts.tar.xz diff --git a/calibre-2.45.0-invalid_assert.patch b/calibre-2.45.0-invalid_assert.patch deleted file mode 100644 index 0e0f818..0000000 --- a/calibre-2.45.0-invalid_assert.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- calibre-2.45.0/src/calibre/headless/fontconfig_database.cpp.orig 2015-12-03 20:23:42.966968311 +0100 -+++ calibre-2.45.0/src/calibre/headless/fontconfig_database.cpp 2015-12-03 20:23:51.271015225 +0100 -@@ -272,7 +272,6 @@ - #endif - - }; --Q_STATIC_ASSERT(sizeof(specialLanguages) / sizeof(const char *) == QChar::ScriptCount); - - // this could become a list of all languages used for each writing - // system, instead of using the single most common language. diff --git a/calibre.spec b/calibre.spec index b25b029..771bf0b 100644 --- a/calibre.spec +++ b/calibre.spec @@ -5,7 +5,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/%{name}/plugins/.*\.so$ Name: calibre -Version: 2.49.0 +Version: 2.53.0 Release: 1%{?dist} Summary: E-book converter and library manager Group: Applications/Multimedia @@ -18,10 +18,10 @@ URL: http://calibre-ebook.com/ # # Download the upstream tarball and invoke this script while in the tarball's # directory: -# ./generate-tarball.sh %%{version} +# ./getsources.sh %%{version} Source0: %{name}-%{version}-nofonts.tar.xz -Source1: generate-tarball.sh +Source1: getsources.sh Source2: calibre-mount-helper Source3: calibre-gui.appdata.xml # @@ -33,8 +33,6 @@ Patch1: %{name}-no-update.patch # This is so gnome-software only 'sees' calibre once. # Patch3: calibre-nodisplay.patch -# Remove invalid assert, temporarily -Patch4: calibre-2.45.0-invalid_assert.patch BuildRequires: python >= 2.6 BuildRequires: python-devel >= 2.6 @@ -42,6 +40,7 @@ BuildRequires: ImageMagick-devel BuildRequires: python-setuptools BuildRequires: python-qt5-devel BuildRequires: python-qt5 +BuildRequires: python-qt5-webkit BuildRequires: podofo-devel BuildRequires: desktop-file-utils BuildRequires: python-mechanize @@ -86,6 +85,7 @@ BuildConflicts: python-feedparser %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: python-qt5 +Requires: python-qt5-webkit Requires: qt5-qtwebkit Requires: qt5-qtsvg Requires: qt5-qtsensors @@ -133,8 +133,6 @@ RTF, TXT, PDF and LRS. # Hide individual launchers for ebook-edit, ebook-viewer and lrfviewer as they # are all accessible in the main calibre GUI. %patch3 -p1 -b .nodisplay -# ! assert -%patch4 -p1 -b .assert # dos2unix newline conversion sed -i 's/\r//' src/calibre/web/feeds/recipes/* @@ -339,6 +337,27 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/ %{_datadir}/appdata/calibre*.appdata.xml %changelog +* Fri Mar 11 2016 Kevin Fenzi - 2.53.0-1 +- Update to 2.53.0. Fixes bug #1316887 + +* Wed Mar 02 2016 Rex Dieter 2.52.0-3 +- +(Build)Requires: python-qt5-webkit + +* Mon Feb 29 2016 Zbigniew Jędrzejewski-Szmek - 2.52.0-2 +- Repack the sources w/o fonts + +* Sat Feb 27 2016 Kevin Fenzi - 2.52.0-1 +- Update to 2.52.0. Fixes bug #1312514 + +* Fri Feb 12 2016 Kevin Fenzi - 2.51.0-1 +- Update to 2.51.0. Fixes bug #1306996 + +* Wed Feb 03 2016 Fedora Release Engineering - 2.50.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 29 2016 Kevin Fenzi - 2.50.1-1 +- Update to 2.50.1 + * Fri Jan 15 2016 Helio Chissini de Castro - 2.49.0-1 - Update to 2.49.0 release. Close bug #1298908 diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 3aeec00..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -VERSION=$1 - -tar -xvJf calibre-$VERSION.tar.xz -rm -f calibre-$VERSION/resources/fonts/liberation/* -rm -f calibre-$VERSION/resources/fonts/prs500/* - -tar -cvJf calibre-$VERSION-nofonts.tar.xz calibre-$VERSION diff --git a/getsources.sh b/getsources.sh new file mode 100755 index 0000000..5b2ab4a --- /dev/null +++ b/getsources.sh @@ -0,0 +1,25 @@ +#!/bin/sh -e + +# Usage: ./getsources.sh [version] +# (this produces calibre-[version]-nofonts.tar.xz) +if [ -n "$1" ]; then + version="$1" +else + version="$(awk '/^Version:/{print $2}' *.spec)" +fi + +fname="calibre-${version}-nofonts.tar.xz" +if [ -e "$fname" ]; then + echo "$fname already exists, not downloading" + exit 0 +fi + +echo "Downloading version ${version}" +[ -x /bin/pxz ] && xz=pxz || xz=xz + +curl -sSL http://code.calibre-ebook.com/dist/src | \ + xzcat | \ + tar --delete --wildcards -f - '*/fonts/liberation/*' | \ + $xz -9v > "$fname" + +echo "$fname is ready" diff --git a/sources b/sources index 6996b20..1a97a1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17a0ce8d9dce5451f949f779321bd4c3 calibre-2.49.0-nofonts.tar.xz +1fa56605e2bc5c6f5c0a6282383b5a62 calibre-2.53.0-nofonts.tar.xz