From 4837072349599f3b4e99adddc51c3dd295aa05b3 Mon Sep 17 00:00:00 2001
From: Dan Horák <dan@danny.cz>
Date: Jan 30 2013 09:10:30 +0000
Subject: update for Pillow (#896301)


---

diff --git a/scribus-pillow.patch b/scribus-pillow.patch
new file mode 100644
index 0000000..d135f6c
--- /dev/null
+++ b/scribus-pillow.patch
@@ -0,0 +1,22 @@
+Index: scribus-1.4.2/scribus/plugins/scriptplugin/scripts/FontSample.py
+===================================================================
+--- scribus-1.4.2.orig/scribus/plugins/scriptplugin/scripts/FontSample.py
++++ scribus-1.4.2/scribus/plugins/scriptplugin/scripts/FontSample.py
+@@ -154,7 +154,7 @@ if not os.path.exists(CONFIG_PATH):
+ 
+ 
+ try:
+-    import Image
++    from PIL import Image
+ except ImportError,err:
+     print 'You need to install Python Imaging Library (PIL).'
+     print 'If using gentoo then you need to emerge /dev-python/imaging'
+@@ -164,7 +164,7 @@ except ImportError,err:
+ 
+ 
+ try:
+-    import ImageTk
++    from PIL import ImageTk
+ except ImportError,err:
+     print 'Module ImageTk not found, font preview disabled'
+     showPreviewPanel = 0
diff --git a/scribus.spec b/scribus.spec
index 8f2e167..7fbe51f 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -16,6 +16,8 @@ Patch0:         %{name}-1.4.0-docdir.patch
 Patch1:         %{name}-to-double.patch
 # fix build with non-free content removed
 Patch2:         %{name}-1.4.2-nonfree.patch
+# update for Pillow (#896301)
+Patch3:         %{name}-pillow.patch
 
 BuildRequires:  cmake
 
@@ -67,6 +69,7 @@ import/export and creation of color separations.
 %patch0 -p1 -b .docdir
 %patch1 -p1 -b .double
 %patch2 -p1 -b .nonfree
+%patch3 -p1 -b .pillow
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -142,6 +145,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Jan 30 2013 Dan Horák <dan[at]danny.cz> - 1.4.2-4
+- update for Pillow (#896301)
+
 * Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.4.2-3
 - rebuild due to "jpeg8-ABI" feature drop