[pyicq-t] Replace python-imaging by python-pillow

Stefan Schulze Frielinghaus stefansf at fedoraproject.org
Sun Jan 20 11:30:52 UTC 2013


commit 35be14cc9e7950d1ebe5b3e209d58cfdae208101
Author: Stefan Schulze Frielinghaus <stefansf at fedoraproject.org>
Date:   Sun Jan 20 12:28:34 2013 +0100

    Replace python-imaging by python-pillow

 pyicq-t.spec        |    9 +++++++--
 pyicqt-pillow.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/pyicq-t.spec b/pyicq-t.spec
index 5dccab9..2a85cdb 100644
--- a/pyicq-t.spec
+++ b/pyicq-t.spec
@@ -2,7 +2,7 @@
 
 Name:           pyicq-t
 Version:        0.8.1.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
@@ -12,6 +12,7 @@ Source0:        http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
 Source1:        pyicq-t.service
 Source2:        pyicq-t-tmpfiles.conf
 Patch0:         config.patch
+Patch1:         pyicqt-pillow.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -19,7 +20,7 @@ BuildRequires:  systemd-units
 Requires:       python-twisted-core
 Requires:       python-twisted-web
 Requires:       python-twisted-words
-Requires:       python-imaging
+Requires:       python-pillow
 Requires:       pyOpenSSL
 
 Requires(pre): shadow-utils
@@ -50,6 +51,7 @@ MySQL back end for ICQ transport
 %prep
 %setup -q -n pyicqt-%{version}
 %patch0 -p0
+%patch1 -p1
 
 %build
 %{__python}    %{python_standard_lib}/compileall.py .
@@ -119,6 +121,9 @@ rm -rf %{buildroot}
 %{_datadir}/pyicq-t/src/xdb/mysql.py*
 
 %changelog
+* Sun Jan 20 2013 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 0.8.1.5-16
+- Replace python-imaging by python-pillow
+
 * Fri Aug 17 2012 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 0.8.1.5-15
 - Apply latest packaging guidelines updates (systemd scriptlets for F18+)
 
diff --git a/pyicqt-pillow.patch b/pyicqt-pillow.patch
new file mode 100644
index 0000000..b1bb84f
--- /dev/null
+++ b/pyicqt-pillow.patch
@@ -0,0 +1,39 @@
+Index: pyicqt-0.8.1.5/src/contact.py
+===================================================================
+--- pyicqt-0.8.1.5.orig/src/contact.py
++++ pyicqt-0.8.1.5/src/contact.py
+@@ -13,7 +13,7 @@ import legacy
+ import globals
+ import base64
+ if not config.disableAvatars:
+-	import Image
++	from PIL import Image
+ import StringIO
+ 
+ 
+Index: pyicqt-0.8.1.5/src/imgmanip.py
+===================================================================
+--- pyicqt-0.8.1.5.orig/src/imgmanip.py
++++ pyicqt-0.8.1.5/src/imgmanip.py
+@@ -5,7 +5,7 @@ import config
+ 
+ if not config.disableAvatars:
+ 	try:
+-		import Image
++		from PIL import Image
+ 		import StringIO
+ 
+ 		def convertToPNG(imageData):
+Index: pyicqt-0.8.1.5/tools/infodump.py
+===================================================================
+--- pyicqt-0.8.1.5.orig/tools/infodump.py
++++ pyicqt-0.8.1.5/tools/infodump.py
+@@ -41,7 +41,7 @@ except:
+ 	print "Nevow Version: Unknown or Not Installed"
+ 
+ try:
+-	from Image import VERSION
++	from PIL.Image import VERSION
+ 	print "Python Imaging Library (PIL) Version: " + VERSION
+ except:
+ 	print "Python Imaging Library (PIL) Version: Unknown or Not Installed"


More information about the scm-commits mailing list