[gourmet] Add patch to work with python-pillow as well as python-imaging
Toshio くらとみ
toshio at fedoraproject.org
Tue Feb 5 00:36:31 UTC 2013
commit e62e256cc5a377540b4acd053081dc8b4686b442
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Mon Feb 4 16:36:18 2013 -0800
Add patch to work with python-pillow as well as python-imaging
gourmet-pillow.patch | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++
gourmet.spec | 7 +++-
2 files changed, 122 insertions(+), 1 deletions(-)
---
diff --git a/gourmet-pillow.patch b/gourmet-pillow.patch
new file mode 100644
index 0000000..f94196b
--- /dev/null
+++ b/gourmet-pillow.patch
@@ -0,0 +1,116 @@
+Index: gourmet-0.15.9/src/lib/exporters/exporter.py
+===================================================================
+--- gourmet-0.15.9.orig/src/lib/exporters/exporter.py
++++ gourmet-0.15.9/src/lib/exporters/exporter.py
+@@ -1,4 +1,5 @@
+-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types
++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types
++from PIL import Image
+ from gourmet import gglobals, convert
+ from gourmet.gdebug import *
+ from gettext import gettext as _
+Index: gourmet-0.15.9/src/lib/GourmetRecipeManager.py
+===================================================================
+--- gourmet-0.15.9.orig/src/lib/GourmetRecipeManager.py
++++ gourmet-0.15.9/src/lib/GourmetRecipeManager.py
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+ import os.path, time, os, sys, re, threading, StringIO, pango, string
+-import Image
++from PIL import Image
+ import gtk.glade, gtk, gobject, gtk.gdk, traceback
+ import batchEditor
+ import recipeManager
+Index: gourmet-0.15.9/src/lib/gtk_extras/ratingWidget.py
+===================================================================
+--- gourmet-0.15.9.orig/src/lib/gtk_extras/ratingWidget.py
++++ gourmet-0.15.9/src/lib/gtk_extras/ratingWidget.py
+@@ -1,7 +1,8 @@
+ import gtk, gtk.gdk
+ import gobject
+ import gourmet.gglobals as gglobals
+-import Image, os.path
++import os.path
++from PIL import Image
+ from gettext import gettext as _
+ import tempfile
+
+Index: gourmet-0.15.9/src/lib/gtk_extras/thumbnail.py
+===================================================================
+--- gourmet-0.15.9.orig/src/lib/gtk_extras/thumbnail.py
++++ gourmet-0.15.9/src/lib/gtk_extras/thumbnail.py
+@@ -1,4 +1,5 @@
+-import Image, urllib, hashlib, os.path, os, StringIO
++import urllib, hashlib, os.path, os, StringIO
++from PIL import Image
+ from gourmet.gdebug import debug
+
+ MAX_THUMBSIZE=10000000
+@@ -78,7 +79,7 @@ def create_thumbnail (path, thumbpath, u
+ info['URI']=str(uri)
+ # now we must create our image guy
+ try:
+- import PngImagePlugin
++ from PIL import PngImagePlugin
+ pnginfo = PngImagePlugin.PngInfo()
+ use_our_png=False
+ except AttributeError:
+Index: gourmet-0.15.9/src/lib/ImageExtras.py
+===================================================================
+--- gourmet-0.15.9.orig/src/lib/ImageExtras.py
++++ gourmet-0.15.9/src/lib/ImageExtras.py
+@@ -1,4 +1,5 @@
+-import os, os.path, tempfile, gtk, Image, StringIO
++import os, os.path, tempfile, gtk , StringIO
++from PIL import Image
+ from gdebug import *
+
+ TMPFILE = tempfile.mktemp(prefix='gourmet_tempfile_')
+Index: gourmet-0.15.9/src/lib/plugins/import_export/html_plugin/html_exporter.py
+===================================================================
+--- gourmet-0.15.9.orig/src/lib/plugins/import_export/html_plugin/html_exporter.py
++++ gourmet-0.15.9/src/lib/plugins/import_export/html_plugin/html_exporter.py
+@@ -1,4 +1,5 @@
+-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
++from PIL import Image
+ from gettext import gettext as _
+ from gourmet import convert,gglobals
+ from gourmet.gdebug import *
+Index: gourmet-0.15.9/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
+===================================================================
+--- gourmet-0.15.9.orig/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
++++ gourmet-0.15.9/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
+@@ -1,4 +1,5 @@
+-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
++from PIL import Image
+ from gourmet import gglobals, convert
+ from gourmet.exporters.exporter import *
+ from gourmet.gdebug import *
+Index: gourmet-0.15.9/src/lib/PngImagePluginUpToDate.py
+===================================================================
+--- gourmet-0.15.9.orig/src/lib/PngImagePluginUpToDate.py
++++ gourmet-0.15.9/src/lib/PngImagePluginUpToDate.py
+@@ -34,7 +34,7 @@ __version__ = "0.8"
+
+ import re, string
+
+-import Image, ImageFile, ImagePalette
++from PIL import Image, ImageFile, ImagePalette
+
+
+ def i16(c):
+Index: gourmet-0.15.9/src/lib/reccard.py
+===================================================================
+--- gourmet-0.15.9.orig/src/lib/reccard.py
++++ gourmet-0.15.9/src/lib/reccard.py
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python
+ import gc
+-import gtk.glade, gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, Image, StringIO, pango, string
++import gtk.glade, gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, StringIO, pango, string
++from PIL import Image
+ import types
+ import xml.sax.saxutils, pango
+ import exporters.exportManager
diff --git a/gourmet.spec b/gourmet.spec
index 69c0308..62ebd5a 100644
--- a/gourmet.spec
+++ b/gourmet.spec
@@ -2,7 +2,7 @@
Name: gourmet
Version: 0.15.9
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Recipe Manager for the GNOME desktop environment
Group: Applications/Productivity
@@ -11,6 +11,7 @@ URL: http://grecipe-manager.sourceforge.net
Source0: http://downloads.sourceforge.net/grecipe-manager/%{name}-%{version}.tar.gz
Patch0: 13a02dd1627664bf0f1c068d3de730e52c9bfbfd.patch
Patch1: remove_bundled_BeautifulSoup.patch
+Patch2: gourmet-pillow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -32,6 +33,7 @@ files and exports web pages & other formats.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
rm ./src/lib/plugins/import_export/web_import_plugin/BeautifulSoup.py
rm ./src/lib/importers/BeautifulSoup.py
#chmod -x data/recipe.dtd
@@ -75,6 +77,9 @@ rm -rf %buildroot
%{python_sitelib}/*.egg-info
%changelog
+* Mon Feb 4 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.15.9-7
+- Add patch to work with python-pillow as well as python-imaging
+
* Tue Jan 15 2013 Jeff Raber <jeff.raber at gmail.com> - 0.15.9-6
- Removed bundled copies of BeautifulSoup.py
More information about the scm-commits
mailing list