From d29ebe1dfee44f8b5b800f506a4c292c9244220d Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Jan 22 2013 20:48:50 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/calibre


Conflicts:
	calibre.spec

---

diff --git a/calibre-pillow.patch b/calibre-pillow.patch
new file mode 100644
index 0000000..afc0ed8
--- /dev/null
+++ b/calibre-pillow.patch
@@ -0,0 +1,13 @@
+Index: calibre/src/calibre/ebooks/textile/functions.py
+===================================================================
+--- calibre.orig/src/calibre/ebooks/textile/functions.py
++++ calibre/src/calibre/ebooks/textile/functions.py
+@@ -86,7 +86,7 @@ def getimagesize(url):
+     """
+ 
+     try:
+-        import ImageFile
++        from PIL import ImageFile
+         import urllib2
+     except ImportError:
+         return None
diff --git a/calibre.spec b/calibre.spec
index 2916d34..9a72c3f 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -19,12 +19,15 @@ URL:            http://calibre-ebook.com/
 Source0:        %{name}-%{version}-nofonts.tar.xz
 Source1:        generate-tarball.sh
 Source2:        calibre-mount-helper
+# The bundled textile needs to be modified to import python-pillow properly.
+# This could go away if we unbundle textile
+Patch0:         %{name}-pillow.patch
 Patch1:         %{name}-no-update.patch
 
 BuildRequires:  python >= 2.6
 BuildRequires:  python-devel >= 2.6
 BuildRequires:  ImageMagick-devel
-BuildRequires:  python-setuptools-devel
+BuildRequires:  python-setuptools
 BuildRequires:  qt4-devel
 BuildRequires:  PyQt4-devel
 BuildRequires:  podofo-devel
@@ -86,6 +89,10 @@ RTF, TXT, PDF and LRS.
 %prep
 %setup -q -n %{name}
 
+# The bundled textile needs to be modified to import python-pillow properly.
+# This could go away if we unbundle textile
+%patch0 -p1
+
 # don't check for new upstream version (that's what packagers do)
 %patch1 -p1 -b .no-update
 
@@ -282,6 +289,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Tue Jan 22 2013 Kevin Fenzi <kevin@scrye.com> 0.9.15-1
 - Update to 0.9.15
 
+* Mon Jan 14 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 0.9.14-2
+- Fix import of PIL in bundled textile so it will work with python-pillow
+
 * Fri Jan 11 2013 Kevin Fenzi <kevin@scrye.com> 0.9.14-1
 - Update to 0.9.14