[polybori] Add -pillow patch from Toshio Kuratomi (bz 896296).

[Jerry James]

commit 15962d177867acbe294cb02cbf134fe83f229a39
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Mon Jan 21 16:07:21 2013 -0700

    Add -pillow patch from Toshio Kuratomi (bz 896296).

 polybori-pillow.patch |   20 ++++++++++++++++++++
 polybori.spec         |    8 +++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/polybori-pillow.patch b/polybori-pillow.patch
new file mode 100644
index 0000000..da19a84
--- /dev/null
+++ b/polybori-pillow.patch
@@ -0,0 +1,20 @@
+--- ./pyroot/polybori/nf.py.orig	2012-07-09 02:23:24.000000000 -0600
++++ ./pyroot/polybori/nf.py	2013-01-21 15:44:05.623016184 -0700
+@@ -55,7 +55,7 @@ def build_and_print_matrices(v,strat):
+ 
+     global mat_counter
+     mat_counter=mat_counter+1
+-    import Image, ImageDraw
++    from PIL import Image, ImageDraw
+     
+     rows=len(polys_in_mat)
+     cols=len(m2i)
+@@ -130,7 +130,7 @@ def build_and_print_matrices_deg_colored
+     polys_in_mat.sort(key=pkey)
+     global mat_counter
+     mat_counter=mat_counter+1
+-    import Image, ImageDraw, ImageColor
++    from PIL import Image, ImageDraw, ImageColor
+     
+     rows=len(polys_in_mat)
+     cols=len(m2i)
diff --git a/polybori.spec b/polybori.spec
index 9158275..db8d583 100644
--- a/polybori.spec
+++ b/polybori.spec
@@ -3,7 +3,7 @@
 
 Name:           polybori
 Version:        0.8.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Framework for Boolean Rings
 Group:          Development/Libraries
 License:        GPLv2+
@@ -17,6 +17,8 @@ Source2:        %{name}-logos.tar.xz
 Patch0:         %{name}-system-cudd.patch
 # Post-release fixes from upstream.
 Patch1:         %{name}-upstream.patch
+# Sent upstream 21 Jan 2013.  Be compatible with both PIL and Pillow.
+Patch2:         %{name}-pillow.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cudd-devel
@@ -118,6 +120,7 @@ Qt GUI for %{name}.
 %setup -q
 %patch0
 %patch1
+%patch2
 
 # Remove private copy of system libs (Cudd, m4ri, and pyparsing)
 rm -rf Cudd M4RI PyPolyBoRi/pyparsing.py
@@ -235,6 +238,9 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||:
 %{_mandir}/man1/PolyGUI.1*
 
 %changelog
+* Mon Jan 21 2013 Jerry James <loganjerry at gmail.com> - 0.8.2-6
+- Add -pillow patch from Toshio Kuratomi (bz 896296)
+
 * Mon Dec 31 2012 Jerry James <loganjerry at gmail.com> - 0.8.2-5
 - Rebuild for m4ri 20121224