From 0cc4bbf6c0f2bd29c56b4117060fb42c19950bcc Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Jun 24 2013 04:46:25 +0000
Subject: Update to 0.9.36


---

diff --git a/.gitignore b/.gitignore
index 5418d5c..21f9b1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,3 +135,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-0.9.32-nofonts.tar.xz
 /calibre-0.9.34-nofonts.tar.xz
 /calibre-0.9.35-nofonts.tar.xz
+/calibre-0.9.36-nofonts.tar.xz
diff --git a/calibre-0.8.21-poppler.patch b/calibre-0.8.21-poppler.patch
deleted file mode 100644
index 04af69a..0000000
--- a/calibre-0.8.21-poppler.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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-manpages.patch b/calibre-manpages.patch
deleted file mode 100644
index 42a56f5..0000000
--- a/calibre-manpages.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py
---- calibre.orig/src/calibre/linux.py	2011-05-27 10:42:14.000000000 -0600
-+++ calibre/src/calibre/linux.py	2011-05-27 20:06:53.461866793 -0600
-@@ -319,7 +319,7 @@
-                     continue
-                 parser = parser()
-                 raw = create_man_page(prog, parser)
--                if isbsd:
-+                if isbsd or islinux:
-                     manfile = os.path.join(manpath, prog+'.1')
-                 else:
-                     manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
-diff -Nur calibre.orig/src/calibre/utils/help2man.py calibre/src/calibre/utils/help2man.py
---- calibre.orig/src/calibre/utils/help2man.py	2011-05-27 10:42:14.000000000 -0600
-+++ calibre/src/calibre/utils/help2man.py	2011-05-27 20:08:28.314256418 -0600
-@@ -4,7 +4,7 @@
- __docformat__ = 'restructuredtext en'
- 
- import time, bz2
--from calibre.constants import isbsd
-+from calibre.constants import isbsd, islinux
- 
- from calibre.constants import __version__, __appname__, __author__
- 
-@@ -58,9 +58,9 @@
-     lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
-             x in lines]
- 
--    if not isbsd:
--        return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
--    else:
-+    if isbsd or islinux:
-         return  (u'\n'.join(lines)).encode('utf-8')
-+    else:
-+        return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
- 
- 
diff --git a/calibre-pillow.patch b/calibre-pillow.patch
deleted file mode 100644
index afc0ed8..0000000
--- a/calibre-pillow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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-pyqt496.patch b/calibre-pyqt496.patch
deleted file mode 100644
index a995af7..0000000
--- a/calibre-pyqt496.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-=== modified file 'src/calibre/gui2/__init__.py'
---- src/calibre/gui2/__init__.py	2012-11-26 06:10:52 +0000
-+++ src/calibre/gui2/__init__.py	2012-12-15 18:45:46 +0000
-@@ -1034,7 +1034,9 @@
-             dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import')
-             dat = dat.replace('from convert.xpath_wizard import',
-                 'from calibre.gui2.convert.xpath_wizard import')
--            dat = re.compile(r'QtGui.QApplication.translate\(.+?,\s+"(.+?)(?<!\\)",.+?\)', re.DOTALL).sub(r'_("\1")', dat)
-+            dat = re.sub(r'^ {4}def _translate\(.+:\s+return.*$', '    pass', dat,
-+                         flags=re.M)
-+            dat = re.compile(r'(?:QtGui.QApplication.translate|(?<!def )_translate)\(.+?,\s+"(.+?)(?<!\\)",.+?\)', re.DOTALL).sub(r'_("\1")', dat)
-             dat = dat.replace('_("MMM yyyy")', '"MMM yyyy"')
-             dat = pat.sub(sub, dat)
-             dat = dat.replace('from QtWebKit.QWebView import QWebView',
-
diff --git a/calibre.spec b/calibre.spec
index cce6fe5..a8986cc 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.9.35
-Release:        2%{?dist}
+Version:        0.9.36
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -18,9 +18,6 @@ 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
@@ -87,10 +84,6 @@ 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
 
@@ -284,6 +277,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/init_calibre.py*
 
 %changelog
+* Sun Jun 23 2013 Kevin Fenzi <kevin@scrye.com> 0.9.36-1
+- Update to 0.9.36
+
 * Mon Jun 17 2013 Rex Dieter <rdieter@fedoraproject.org> 0.9.35-2
 - rebuild (sip)
 
diff --git a/sources b/sources
index 796ad83..67f0e90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5875f6504ffea281a6e6ead2b3ad81b  calibre-0.9.35-nofonts.tar.xz
+fd1d9fa95208ae359b7b3a24f5750951  calibre-0.9.36-nofonts.tar.xz