[calibre] Update to 0.8.21

[Kevin Fenzi]

commit 559fb11c8723413ac277cb82e94c6d1d4837cc92
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Oct 9 19:10:48 2011 -0600

    Update to 0.8.21

 .gitignore                          |    1 +
 calibre-0.7.38-pyPdf-fix.patch      |   96 -----------------------------------
 calibre-0.8.10-poppler.patch        |   23 --------
 calibre-0.8.18-poppler-0.17.3.patch |   26 ---------
 calibre-0.8.21-poppler.patch        |   22 ++++++++
 calibre.spec                        |   17 +++---
 sources                             |    2 +-
 7 files changed, 32 insertions(+), 155 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2829bc9..599a2e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-0.8.18-nofonts.tar.xz
 /calibre-0.8.19-nofonts.tar.xz
 /calibre-0.8.20-nofonts.tar.xz
+/calibre-0.8.21-nofonts.tar.xz
diff --git a/calibre-0.8.21-poppler.patch b/calibre-0.8.21-poppler.patch
new file mode 100644
index 0000000..04af69a
--- /dev/null
+++ b/calibre-0.8.21-poppler.patch
@@ -0,0 +1,22 @@
+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 e1a4c5e..b798582 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.8.20
-Release:        2%{?dist}
+Version:        0.8.21
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -21,8 +21,7 @@ Source1:        generate-tarball.sh
 Source2:        calibre-mount-helper
 Patch0:         %{name}-manpages.patch
 Patch1:         %{name}-no-update.patch
-Patch3:         calibre-0.8.10-poppler.patch
-Patch4:		calibre-0.8.18-poppler-0.17.3.patch
+Patch2:		calibre-0.8.21-poppler.patch
 
 BuildRequires:  python >= 2.6
 BuildRequires:  python-devel >= 2.6
@@ -90,11 +89,8 @@ RTF, TXT, PDF and LRS.
 # don't check for new upstream version (that's what packagers do)
 %patch1 -p1 -b .no-update
 
-# work with poppler 0.17
-%patch3 -p1 -b .poppler-fix
-
-# fix for poppler 0.17.3
-%patch4 -p1 -b .poppler-0.17.3
+# modify poppler checks
+%patch2 -p1 -b .poppler
 
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
@@ -258,6 +254,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/*
 
 %changelog
+* Sat Oct 09 2011 Kevin Fenzi <kevin at scrye.com> - 0.8.21-1
+- Update to 0.8.21
+
 * Fri Sep 30 2011 Marek Kasik <mkasik at redhat.com> - 0.8.20-2
 - Rebuild (poppler-0.18.0)
 
diff --git a/sources b/sources
index 5658477..cc14547 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f988e850bf146caf6a6382bd6bd7eb42  calibre-0.8.20-nofonts.tar.xz
+a2de1cd0708deeaeea83f7dabd3636bf  calibre-0.8.21-nofonts.tar.xz