[PySolFC] Build with a patch so we can use python-pillow instead of python-imaging

[Toshio くらとみ]

commit 38b6fcd1ac6c37b72d0972d0161543c53ab593ef
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Jan 30 21:34:39 2013 -0800

    Build with a patch so we can use python-pillow instead of python-imaging

 PySolFC-pillow.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 PySolFC.spec         |    7 ++++++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/PySolFC-pillow.patch b/PySolFC-pillow.patch
new file mode 100644
index 0000000..454581e
--- /dev/null
+++ b/PySolFC-pillow.patch
@@ -0,0 +1,44 @@
+Index: PySolFC-2.0/pysollib/mfxutil.py
+===================================================================
+--- PySolFC-2.0.orig/pysollib/mfxutil.py
++++ PySolFC-2.0/pysollib/mfxutil.py
+@@ -41,18 +41,18 @@ from settings import PACKAGE, TOOLKIT
+ Image = ImageTk = ImageOps = None
+ if TOOLKIT == 'tk':
+     try: # PIL
+-        import Image
+-        import ImageTk
+-        import ImageOps
++        from PIL import Image
++        from PIL import ImageTk
++        from PIL import ImageOps
+     except ImportError:
+         Image = None
+     else:
+         # for py2exe
+-        import GifImagePlugin
+-        import PngImagePlugin
+-        import JpegImagePlugin
+-        import BmpImagePlugin
+-        import PpmImagePlugin
++        from PIL import GifImagePlugin
++        from PIL import PngImagePlugin
++        from PIL import JpegImagePlugin
++        from PIL import BmpImagePlugin
++        from PIL import PpmImagePlugin
+         Image._initialized = 2
+ 
+ 
+Index: PySolFC-2.0/scripts/cardset_viewer.py
+===================================================================
+--- PySolFC-2.0.orig/scripts/cardset_viewer.py
++++ PySolFC-2.0/scripts/cardset_viewer.py
+@@ -7,7 +7,7 @@ from glob import glob
+ from math import sqrt, sin, cos, pi
+ from Tkinter import *
+ try:
+-    import Image, ImageTk
++    from PIL import Image, ImageTk
+ except ImportError:
+     Image = None
+ 
diff --git a/PySolFC.spec b/PySolFC.spec
index 7ff59f5..985464c 100644
--- a/PySolFC.spec
+++ b/PySolFC.spec
@@ -5,7 +5,7 @@
 
 Name:           PySolFC
 Version:        2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A collection of solitare card games
 Group:          Amusements/Games
 License:        GPLv2+
@@ -13,6 +13,7 @@ URL:            http://pysolfc.sourceforge.net
 Source0:        http://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar.bz2
 Source1:        pysol-start-script
 Patch0:         PySolFC-desktop-exec.patch
+Patch1:         PySolFC-pillow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -38,6 +39,7 @@ written plug-ins, an integrated HTML help browser, and lots of documentation.
 %prep
 %setup -q
 %patch0 -p0 -b .desktop-exec
+%patch1 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 30 2013 Toshio Kuratomi <toshio at fedoraproject.org> 2.0-7
+- Build with a patch so we can use python-pillow instead of python-imaging
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild