- 0.8.58

- poppler patch removed, pdf reflow is now in python

Changed files:
    calibre-0.8.21-poppler.patch -> 1.2
    calibre.spec -> 1.147

diff --git a/calibre-0.8.21-poppler.patch b/calibre-0.8.21-poppler.patch
deleted file mode 100644 (file)
index 04af69a..0000000
--- a/calibre-0.8.21-poppler.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur calibre.orig/src/calibre/ebooks/pdf/reflow.cpp calibre/src/calibre/ebooks/pdf/reflow.cpp
---- calibre.orig/src/calibre/ebooks/pdf/reflow.cpp     2011-09-30 11:28:44.000000000 -0600
-+++ calibre/src/calibre/ebooks/pdf/reflow.cpp  2011-10-09 18:57:36.433731713 -0600
-@@ -12,6 +12,7 @@
- #include <splash/SplashErrorCodes.h>
- #include "reflow.h"
- #include "utils.h"
-+#include <glib/poppler-features.h>
- 
- using namespace std;
- using namespace calibre_reflow;
-diff -Nur calibre.orig/src/calibre/ebooks/pdf/reflow.h calibre/src/calibre/ebooks/pdf/reflow.h
---- calibre.orig/src/calibre/ebooks/pdf/reflow.h       2011-09-30 11:28:44.000000000 -0600
-+++ calibre/src/calibre/ebooks/pdf/reflow.h    2011-10-09 18:57:04.338582882 -0600
-@@ -36,6 +36,7 @@
- #include "fonts.h"
- #include "links.h"
- #include "images.h"
-+#include <glib/poppler-features.h>
- 
- using namespace std;
- 

diff --git a/calibre.spec b/calibre.spec
index 58cd52df2acd7d0ebc84358836a2a3c14fa3dd9d..0449c1dff0f1fdf7b02fe979ae4edc987dfe6da6 100644 (file)
--- a/calibre.spec
+++ b/calibre.spec
@@ -12,21 +12,19 @@
 Summary:       E-book converter and library management
 Summary(pl.UTF-8):     Konwerter oraz biblioteka dla e-booków
 Name:          calibre
-Version:       0.8.53
-Release:       6
+Version:       0.8.58
+Release:       1
 License:       GPL v3+
 Group:         Applications/Multimedia
 Source0:       %{name}-%{version}-nofonts.tar.xz
-# Source0-md5: 78785f551169af48f7334785cd1c6d2e
+# Source0-md5: a431cc15339f345068ad89505070c6b2
 Source1:       generate-tarball.sh
 Source2:       %{name}-mount-helper
 Patch0:                %{name}-prefix.patch
-
-Patch2:                %{name}-no-update.patch
-Patch3:                %{name}-env_module.patch
-Patch4:                %{name}-locales.patch
-Patch5:                shebang-python-fix.patch
-Patch6:                %{name}-0.8.21-poppler.patch
+Patch1:                %{name}-no-update.patch
+Patch2:                %{name}-env_module.patch
+Patch3:                %{name}-locales.patch
+Patch4:                shebang-python-fix.patch
 URL:           http://www.calibre-ebook.com/
 BuildRequires: ImageMagick-devel >= 6.6.4.7
 BuildRequires: chmlib-devel
@@ -112,12 +110,10 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla calibre.
 %prep
 %setup -q -n %{name}
 %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