From b359343ce16ff2390602154a81907b1b1f88614e Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Jul 16 2011 16:19:56 +0000
Subject: Update to 0.8.10

Add patch to work with poppler 0.17

---

diff --git a/.gitignore b/.gitignore
index 9261036..68d8c47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-0.8.4-nofonts.tar.xz
 /calibre-0.8.7-nofonts.tar.xz
 /calibre-0.8.8-nofonts.tar.xz
+/calibre-0.8.10-nofonts.tar.xz
diff --git a/calibre-0.8.10-poppler.patch b/calibre-0.8.10-poppler.patch
new file mode 100644
index 0000000..6858a98
--- /dev/null
+++ b/calibre-0.8.10-poppler.patch
@@ -0,0 +1,23 @@
+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-07-15 10:54:35.000000000 -0600
++++ calibre/src/calibre/ebooks/pdf/reflow.cpp	2011-07-16 10:01:28.576025342 -0600
+@@ -625,7 +625,7 @@
+   return oss.str();
+ }
+ 
+-void XMLOutputDev::process_link(Link* link){
++void XMLOutputDev::process_link(AnnotLink* link){
+   double _x1, _y1, _x2, _y2;
+   int x1, y1, x2, y2;
+   
+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-07-15 10:54:35.000000000 -0600
++++ calibre/src/calibre/ebooks/pdf/reflow.h	2011-07-16 10:00:49.766268969 -0600
+@@ -244,6 +244,6 @@
+     XMLImages *images;
+     PDFDoc *doc;
+ 
+-    void process_link(Link* link);
++    void process_link(AnnotLink* link);
+ };
+ }
diff --git a/calibre.spec b/calibre.spec
index 52f30a6..d392fa5 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.8.8
+Version:        0.8.10
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -24,6 +24,7 @@ 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
 
 BuildRequires:  python >= 2.6
 BuildRequires:  python-devel >= 2.6
@@ -94,6 +95,9 @@ RTF, TXT, PDF and LRS.
 # fix crash on pdf export (BZ #673604)
 %patch2 -p1 -b .pdf-export-fix
 
+# work with poppler 0.17
+%patch3 -p1 -b .poppler-fix
+
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
 
@@ -256,6 +260,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jul 16 2011 Kevin Fenzi <kevin@scrye.com> - 0.8.10-1
+- Update to 0.8.10
+- Add patch to work with poppler 0.17
+
 * Fri Jul 01 2011 Kevin Fenzi <kevin@scrye.com> - 0.8.8-1
 - Update to 0.8.8
 
diff --git a/sources b/sources
index e23c62b..e360523 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b80bea879e206e7f92b3b208d195cfe6  calibre-0.8.8-nofonts.tar.xz
+c19d1cc97315b13b021faf657958efe9  calibre-0.8.10-nofonts.tar.xz