[calibre] Update to 0.9.38

[Kevin Fenzi]

commit 8dfdc0a429b1039eda23ad004750747d330a899c
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Jul 5 13:27:47 2013 -0600

    Update to 0.9.38
    
    - Add patch for new python-pillow

 .gitignore                  |    1 +
 calibre-0.9.38-pillow.patch |   16 ++++++++++++++++
 calibre.spec                |    9 ++++++++-
 sources                     |    2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21f9b1c..560ea95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-0.9.34-nofonts.tar.xz
 /calibre-0.9.35-nofonts.tar.xz
 /calibre-0.9.36-nofonts.tar.xz
+/calibre-0.9.38-nofonts.tar.xz
diff --git a/calibre-0.9.38-pillow.patch b/calibre-0.9.38-pillow.patch
new file mode 100644
index 0000000..d98b10c
--- /dev/null
+++ b/calibre-0.9.38-pillow.patch
@@ -0,0 +1,16 @@
+diff -Nur calibre.orig/src/calibre/test_build.py calibre/src/calibre/test_build.py
+--- calibre.orig/src/calibre/test_build.py	2013-07-05 13:10:05.381104153 -0600
++++ calibre/src/calibre/test_build.py	2013-07-05 13:11:28.236681380 -0600
+@@ -74,12 +74,6 @@
+     else:
+         raise RuntimeError('ImageMagick choked!')
+     from PIL import Image
+-    try:
+-        import _imaging, _imagingmath, _imagingft
+-        _imaging, _imagingmath, _imagingft
+-    except ImportError:
+-        from PIL import _imaging, _imagingmath, _imagingft
+-    _imaging, _imagingmath, _imagingft
+     i = Image.open(cStringIO.StringIO(data))
+     if i.size < (20, 20):
+         raise RuntimeError('PIL choked!')
diff --git a/calibre.spec b/calibre.spec
index a8986cc..a0ace19 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.9.36
+Version:        0.9.38
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -19,6 +19,7 @@ Source0:        %{name}-%{version}-nofonts.tar.xz
 Source1:        generate-tarball.sh
 Source2:        calibre-mount-helper
 Patch1:         %{name}-no-update.patch
+Patch2:         calibre-0.9.38-pillow.patch
 
 BuildRequires:  python >= 2.6
 BuildRequires:  python-devel >= 2.6
@@ -86,6 +87,8 @@ RTF, TXT, PDF and LRS.
 
 # don't check for new upstream version (that's what packagers do)
 %patch1 -p1 -b .no-update
+# Remove some old pillow imports
+%patch2 -p1 -b .no-update
 
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
@@ -277,6 +280,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/init_calibre.py*
 
 %changelog
+* Fri Jul 05 2013 Kevin Fenzi <kevin at scrye.com> 0.9.38-1
+- Update to 0.9.38
+- Add patch for new python-pillow
+
 * Sun Jun 23 2013 Kevin Fenzi <kevin at scrye.com> 0.9.36-1
 - Update to 0.9.36
 
diff --git a/sources b/sources
index 67f0e90..1233a48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd1d9fa95208ae359b7b3a24f5750951  calibre-0.9.36-nofonts.tar.xz
+45a606991938a79af61b9c8fd458b1a5  calibre-0.9.38-nofonts.tar.xz