[calibre] Update to 0.8.18 Apply patch for new poppler Drop upstreamed pdf write patch

[Kevin Fenzi]

commit 781fbc660e9079370b30334247555f2608700052
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Sep 9 12:38:23 2011 -0600

    Update to 0.8.18
    Apply patch for new poppler
    Drop upstreamed pdf write patch

 .gitignore                          |    1 +
 calibre-0.8.18-poppler-0.17.3.patch |   26 ++++++++++++++++++++++++++
 calibre.spec                        |   17 +++++++++--------
 sources                             |    2 +-
 4 files changed, 37 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b6e962..2a21b65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-0.8.15-nofonts.tar.xz
 /calibre-0.8.16-nofonts.tar.xz
 /calibre-0.8.17-nofonts.tar.xz
+/calibre-0.8.18-nofonts.tar.xz
diff --git a/calibre-0.8.18-poppler-0.17.3.patch b/calibre-0.8.18-poppler-0.17.3.patch
new file mode 100644
index 0000000..bdf9070
--- /dev/null
+++ b/calibre-0.8.18-poppler-0.17.3.patch
@@ -0,0 +1,26 @@
+--- calibre/src/calibre/ebooks/pdf/images.cpp	2011-07-22 18:17:44.000000000 +0200
++++ calibre/src/calibre/ebooks/pdf/images.cpp	2011-09-09 13:30:26.000000000 +0200
+@@ -126,7 +126,13 @@ void XMLImages::add(GfxState *state, Obj
+ 
+     if (img->type == jpeg) {
+         int c;
++
++#if POPPLER_CHECK_VERSION(0, 17, 3)
++        str = str->getBaseStream();
++#else
+         str = ((DCTStream *)str)->getRawStream();
++#endif
++
+         str->reset();
+ 
+         // copy the stream
+--- calibre/src/calibre/ebooks/pdf/images.h	2011-09-09 13:35:14.000000000 +0200
++++ calibre/src/calibre/ebooks/pdf/images.h	2011-09-09 13:35:27.000000000 +0200
+@@ -12,6 +12,7 @@
+ #include <splash/SplashBitmap.h>
+ #include <png.h>
+ #include <jpeglib.h>
++#include <glib/poppler-features.h>
+ #include "utils.h"
+ 
+ using namespace std;
diff --git a/calibre.spec b/calibre.spec
index 07609dd..e3c900e 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.17
-Release:        2%{?dist}
+Version:        0.8.18
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -21,10 +21,8 @@ Source1:        generate-tarball.sh
 Source2:        calibre-mount-helper
 Patch0:         %{name}-manpages.patch
 Patch1:         %{name}-no-update.patch
-# Patch to fix crash on pdf export (BZ #673604)
-# (use the correct API for the external pyPdf library)
-Patch2:         %{name}-0.7.38-pyPdf-fix.patch
 Patch3:         calibre-0.8.10-poppler.patch
+Patch4:		calibre-0.8.18-poppler-0.17.3.patch
 
 BuildRequires:  python >= 2.6
 BuildRequires:  python-devel >= 2.6
@@ -92,12 +90,12 @@ RTF, TXT, PDF and LRS.
 # don't check for new upstream version (that's what packagers do)
 %patch1 -p1 -b .no-update
 
-# fix crash on pdf export (BZ #673604)
-%patch2 -p1 -b .pdf-export-fix
-
 # work with poppler 0.17
 %patch3 -p1 -b .poppler-fix
 
+# fix for poppler 0.17.3
+%patch4 -p1 -b .poppler-0.17.3
+
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
 
@@ -260,6 +258,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 09 2011 Kevin Fenzi <kevin at scrye.com> - 0.8.18-1
+- Update to 0.8.18 and add patch to work with poppler 0.17.3
+
 * Thu Sep 08 2011 Kevin Fenzi <kevin at scrye.com> - 0.8.17-2
 - Rebuild for new libicu
 
diff --git a/sources b/sources
index 5f1d5b8..a1eaf84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da9cee465c358cddc9c92b9ec2a1b694  calibre-0.8.17-nofonts.tar.xz
+b99317b3d0ac1c75f3fec6231a53c76e  calibre-0.8.18-nofonts.tar.xz