[jbrout] Compatibility with python-pillow

[Toshio くらとみ]

commit cd09865aad57f190607e0ab0de2f1fc8eda65b61
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 4 17:38:25 2013 -0800

    Compatibility with python-pillow

 jbrout-pillow.patch |   26 ++++++++++++++++++++++++++
 jbrout.spec         |    9 ++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/jbrout-pillow.patch b/jbrout-pillow.patch
new file mode 100644
index 0000000..e5c5574
--- /dev/null
+++ b/jbrout-pillow.patch
@@ -0,0 +1,26 @@
+Index: jbrout/jbrout/jbrout.py
+===================================================================
+--- jbrout.orig/jbrout/jbrout.py
++++ jbrout/jbrout/jbrout.py
+@@ -2387,7 +2387,7 @@ class Window(GladeApp):
+         openURL(u"http://jbrout.free.fr/help/%s/" % lang)
+ 
+     def on_a_propos_activate(self, widget, *args):
+-        import Image
++        from PIL import Image
+         about = gtk.AboutDialog()
+         about.set_name('jbrout')
+         about.set_version(__version__)
+Index: jbrout/jbrout/plugins/instantWeb/instantweb.py
+===================================================================
+--- jbrout.orig/jbrout/plugins/instantWeb/instantweb.py
++++ jbrout/jbrout/plugins/instantWeb/instantweb.py
+@@ -25,7 +25,7 @@ import select
+ from jbrout.common import cd2rd
+ 
+ try:
+-    import Image
++    from PIL import Image
+ except:
+     raise "you should install PIL module (http://www.pythonware.com/products/pil/)"
+ 
diff --git a/jbrout.spec b/jbrout.spec
index 00f7c50..9c0430e 100644
--- a/jbrout.spec
+++ b/jbrout.spec
@@ -4,7 +4,7 @@
 Name:           jbrout
 Version:        0.3.%{revno}
 %if 0%{?svn_checkout}
-Release:        0.6.svn%{revno}%{?dist}
+Release:        0.7.svn%{revno}%{?dist}
 %else
 Release:        1%{?dist}
 %endif
@@ -30,6 +30,9 @@ Patch0:         jbrout-purge-no-attribute-attrib.patch
 # Fedora users have no choice about what pyexiv2 to use.
 # Besides pyexiv2 0.3.* is now officially stable.
 Patch1:         jbrout-no-pyexiv2-warning.patch
+# python-pillow compatibility
+# https://bugzilla.redhat.com/show_bug.cgi?id=895287
+Patch2: jbrout-pillow.patch
 BuildArch:      noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6
@@ -62,6 +65,7 @@ jBrout is able to :
 %setup -q -n %{name}
 %patch0 -p1 -b .noAttributeAttrib
 %patch1 -p1 -b .noPyexiv2Warn
+%patch2 -p1 -b .compat-pillow
 sh %{SOURCE5}
 install -p %{SOURCE1} jbrout/Makefile
 install -p -m a+rx,u+w %{SOURCE4} jbrout/install-script
@@ -99,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/jbrout.desktop
 
 %changelog
+* Mon Feb  4 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.338-0.7.svn338
+- Compatibility with python-pillow
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.338-0.6.svn338
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild