From e7fbaaf6d8ee2cb161c92124a388e9337793619e Mon Sep 17 00:00:00 2001
From: Parag A Nemade <pnemade@fedoraproject.org>
Date: Nov 29 2016 06:40:45 +0000
Subject: Resolves: rh#1278201 - ImportError: No module named 'pygtk'


---

diff --git a/Make-inspect.py-file-compatible-to-run-with-python2-python3.patch b/Make-inspect.py-file-compatible-to-run-with-python2-python3.patch
new file mode 100644
index 0000000..ee49e28
--- /dev/null
+++ b/Make-inspect.py-file-compatible-to-run-with-python2-python3.patch
@@ -0,0 +1,35 @@
+From 751da6367a57d6d7498f78e44ae7f978c013ab74 Mon Sep 17 00:00:00 2001
+From: Parag A Nemade <pnemade@fedoraproject.org>
+Date: Mon, 28 Nov 2016 13:47:30 +0530
+Subject: [PATCH] Make inspect.py file compatible to run with python2 and
+ python3
+
+Signed-off-by: Parag A Nemade <pnemade@fedoraproject.org>
+---
+ Lib/fontTools/inspect.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Lib/fontTools/inspect.py b/Lib/fontTools/inspect.py
+index d48be9c..f1ada6c 100644
+--- a/Lib/fontTools/inspect.py
++++ b/Lib/fontTools/inspect.py
+@@ -8,8 +8,14 @@
+ from __future__ import print_function, division, absolute_import
+ from fontTools.misc.py23 import *
+ from fontTools import misc, ttLib, cffLib
+-import pygtk
+-pygtk.require('2.0')
++try:
++    from gi import pygtkcompat
++except ImportError:
++    pygtkcompat = None
++
++if pygtkcompat is not None:
++    pygtkcompat.enable()
++    pygtkcompat.enable_gtk(version='3.0')
+ import gtk
+ import sys
+ 
+-- 
+2.9.3
+
diff --git a/fonttools.spec b/fonttools.spec
index 292dea9..c5c5d0a 100644
--- a/fonttools.spec
+++ b/fonttools.spec
@@ -8,12 +8,15 @@ from an XML-based format.
 
 Name:           fonttools
 Version:        3.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools to manipulate font files
 License:        BSD
 URL:            https://github.com/fonttools/%{name}/
 Source0:        https://files.pythonhosted.org/packages/source/f/%{pypi_name}/%{pypi_name}-%{version}.zip
 
+# Upstream merged patch
+Patch0:         Make-inspect.py-file-compatible-to-run-with-python2-python3.patch
+
 Requires:       python3-fonttools
 BuildArch:      noarch
 Provides:       ttx = %{version}-%{release}
@@ -46,7 +49,7 @@ Requires:       python3-numpy
 %{desc}
 
 %prep
-%autosetup
+%autosetup -p1
 rm -rf *.egg-info
 
 sed -i '1d' Lib/fontTools/mtiLib/__init__.py
@@ -85,6 +88,9 @@ sed -i '1d' Lib/fontTools/mtiLib/__init__.py
 %{python3_sitelib}/%{name}-%{version}-py3.?.egg-info
 
 %changelog
+* Tue Nov 29 2016 Parag Nemade <pnemade AT redhat DOT com> - 3.2.2-2
+- Resolves: rh#1278201 - ImportError: No module named 'pygtk' 
+
 * Fri Nov 25 2016 Parag Nemade <pnemade AT redhat DOT com> - 3.2.2-1
 - Update to version 3.2.2