[wallpapoz] Don't import Image directly and import PIL instead for
Mamoru Tasaka
mtasaka at fedoraproject.org
Tue Jan 15 09:21:28 UTC 2013
commit 3f6c643334ae4630ec29f30244f8f920a44f31d9
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date: Tue Jan 15 18:21:09 2013 +0900
Don't import Image directly and import PIL instead for
F-19 Pillow conversion
Patch from Stephen Gallagher <sgallagh at redhat.com>
(bug 895217)
wallpapoz-0.6.2-import-PIL-for-Image.patch | 132 ++++++++++++++++++++++++++++
wallpapoz.spec | 13 +++-
2 files changed, 144 insertions(+), 1 deletions(-)
---
diff --git a/wallpapoz-0.6.2-import-PIL-for-Image.patch b/wallpapoz-0.6.2-import-PIL-for-Image.patch
new file mode 100644
index 0000000..cab327b
--- /dev/null
+++ b/wallpapoz-0.6.2-import-PIL-for-Image.patch
@@ -0,0 +1,132 @@
+diff -ruN wallpapoz-0.6.2.orig/setup.py wallpapoz-0.6.2/setup.py
+--- wallpapoz-0.6.2.orig/setup.py 2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/setup.py 2013-01-14 15:57:08.902128603 -0500
+@@ -123,7 +123,7 @@
+ print " !!! Python Glade ............. ", _("Not found")
+ required_found = False
+ try:
+- import Image
++ from PIL import Image
+ print " Python Imaging Library ....... OK"
+ except ImportError:
+ print " !!! Python Imaging Library ... ", _("Not found")
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz wallpapoz-0.6.2/src/wallpapoz
+--- wallpapoz-0.6.2.orig/src/wallpapoz 2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz 2013-01-14 16:00:16.960947005 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.anime wallpapoz-0.6.2/src/wallpapoz.anime
+--- wallpapoz-0.6.2.orig/src/wallpapoz.anime 2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.anime 2013-01-14 15:58:53.632027371 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.deletefirst wallpapoz-0.6.2/src/wallpapoz.deletefirst
+--- wallpapoz-0.6.2.orig/src/wallpapoz.deletefirst 2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.deletefirst 2013-01-14 15:59:32.240990119 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.deletelastone wallpapoz-0.6.2/src/wallpapoz.deletelastone
+--- wallpapoz-0.6.2.orig/src/wallpapoz.deletelastone 2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.deletelastone 2013-01-14 15:59:20.417001528 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.dircheck wallpapoz-0.6.2/src/wallpapoz.dircheck
+--- wallpapoz-0.6.2.orig/src/wallpapoz.dircheck 2013-01-14 15:56:24.057172107 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.dircheck 2013-01-14 15:57:32.238106009 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.noitem wallpapoz-0.6.2/src/wallpapoz.noitem
+--- wallpapoz-0.6.2.orig/src/wallpapoz.noitem 2013-01-14 15:56:24.057172107 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.noitem 2013-01-14 15:57:47.354091394 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.nonutf8 wallpapoz-0.6.2/src/wallpapoz.nonutf8
+--- wallpapoz-0.6.2.orig/src/wallpapoz.nonutf8 2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.nonutf8 2013-01-14 15:59:04.928016478 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.patch_init wallpapoz-0.6.2/src/wallpapoz.patch_init
+--- wallpapoz-0.6.2.orig/src/wallpapoz.patch_init 2013-01-14 15:56:24.057172107 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.patch_init 2013-01-14 15:58:33.808046499 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.workspace_img wallpapoz-0.6.2/src/wallpapoz.workspace_img
+--- wallpapoz-0.6.2.orig/src/wallpapoz.workspace_img 2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.workspace_img 2013-01-14 15:59:54.968968202 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.workspace_num_incr wallpapoz-0.6.2/src/wallpapoz.workspace_num_incr
+--- wallpapoz-0.6.2.orig/src/wallpapoz.workspace_num_incr 2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.workspace_num_incr 2013-01-14 16:00:08.673954992 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+
+ try:
+ import gnome
diff --git a/wallpapoz.spec b/wallpapoz.spec
index ff5dbfe..7a9a1ad 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
%define mainver 0.6.2
%undefine betaver
#%%define svnver svn92_trunk
-%define fedorarel 2
+%define fedorarel 3
%define rel %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
@@ -71,6 +71,10 @@ Patch13: wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increas
# Return to set default WM to GNOME3 when proper WM is not found
# (bug 857587)
Patch14: wallpapoz-0.6.2-wm-return-to-default.patch
+# Don't import Image directory and import PIL instead for
+# F-19 Pillow conversion
+# (bug 895217)
+Patch15: wallpapoz-0.6.2-import-PIL-for-Image.patch
BuildArch: noarch
@@ -112,6 +116,7 @@ wallpapers for different workspaces or virtual desktops.
%patch12 -p1 -b .workspace_img
%patch13 -p1 -b .workspace_num_incr
%patch14 -p1 -b .default
+%patch15 -p1 -b .pil
# Umm... permission fix
find . -type f -print0 | xargs -0 chmod 0644
@@ -183,6 +188,12 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
%{_datadir}/applications/fedora-%{name}.desktop
%changelog
+* Tue Jan 15 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.6.2-3
+- Don't import Image directly and import PIL instead for
+ F-19 Pillow conversion
+ Patch from Stephen Gallagher <sgallagh at redhat.com>
+ (bug 895217)
+
* Tue Sep 18 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.6.2-2
- Return to set default WM to GNOME3 when proper WM is not found
(bug 857587)
More information about the scm-commits
mailing list