[openxcap] Patch to add compatibility with python-pillow (see rhbz #895773)

Toshio くらとみ toshio at fedoraproject.org
Tue Feb 5 01:42:37 UTC 2013


commit 34d0e9ea8f7a8214684943fd9779b90bef2471c9
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 4 17:42:26 2013 -0800

    Patch to add compatibility with python-pillow (see rhbz #895773)

 openxcap-pillow.patch |   13 +++++++++++++
 openxcap.spec         |   10 ++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/openxcap-pillow.patch b/openxcap-pillow.patch
new file mode 100644
index 0000000..2bbf9ea
--- /dev/null
+++ b/openxcap-pillow.patch
@@ -0,0 +1,13 @@
+Index: openxcap-2.0.1/xcap/appusage/icon.py
+===================================================================
+--- openxcap-2.0.1.orig/xcap/appusage/icon.py
++++ openxcap-2.0.1/xcap/appusage/icon.py
+@@ -3,7 +3,7 @@
+ #
+ 
+ import base64
+-import Image
++from PIL import Image
+ 
+ from cStringIO import StringIO
+ from lxml import etree
diff --git a/openxcap.spec b/openxcap.spec
index bb2505b..798edd8 100644
--- a/openxcap.spec
+++ b/openxcap.spec
@@ -3,7 +3,7 @@
 
 Name:		openxcap
 Version:	2.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Fully featured XCAP server
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -12,6 +12,9 @@ Source0:	http://download.ag-projects.com/XCAP/%{name}-%{version}.tar.gz
 Source1:	%{name}.init
 Source2:	%{name}.service
 Source3:	%{name}.tmpfiles.conf
+# Make openxcap compatible with python-pillow
+# https://bugzilla.redhat.com/show_bug.cgi?id=895773
+Patch0:		openxcap-pillow.patch
 
 BuildArch:      noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -58,7 +61,7 @@ SIMPLE server solution.
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %{__python} -c 'import setuptools; execfile("setup.py")' build
@@ -161,6 +164,9 @@ chown -R %{name}:%{name} %{_localstatedir}/run/%{name}
 
 
 %changelog
+* Mon Feb  4 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.1-2
+- Patch to add compatibility with python-pillow (see rhbz #895773)
+
 * Sat Aug 18 2012 Peter Lemenkov <lemenkov at gmail.com> - 2.0.1-1
 - Ver. 2.0.1
 - Switch to systemd


More information about the scm-commits mailing list