diff --git a/.gitignore b/.gitignore index 07bd37a..1ce8a47 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ fonttools-2.3.tar.gz /fonttools-3.2.0.zip /fonttools-3.2.1.zip /fonttools-3.2.2.zip +/fonttools-3.2.3.zip 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 deleted file mode 100644 index ee49e28..0000000 --- a/Make-inspect.py-file-compatible-to-run-with-python2-python3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 751da6367a57d6d7498f78e44ae7f978c013ab74 Mon Sep 17 00:00:00 2001 -From: Parag A Nemade -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 ---- - 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 c5c5d0a..59ef0ef 100644 --- a/fonttools.spec +++ b/fonttools.spec @@ -7,16 +7,13 @@ contains a tool called “TTX” which converts TrueType/OpenType fonts to and \ from an XML-based format. Name: fonttools -Version: 3.2.2 -Release: 2%{?dist} +Version: 3.2.3 +Release: 1%{?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} @@ -49,7 +46,7 @@ Requires: python3-numpy %{desc} %prep -%autosetup -p1 +%autosetup rm -rf *.egg-info sed -i '1d' Lib/fontTools/mtiLib/__init__.py @@ -88,6 +85,9 @@ sed -i '1d' Lib/fontTools/mtiLib/__init__.py %{python3_sitelib}/%{name}-%{version}-py3.?.egg-info %changelog +* Mon Dec 05 2016 Parag Nemade - 3.2.3-1 +- Update to version 3.2.3 + * Tue Nov 29 2016 Parag Nemade - 3.2.2-2 - Resolves: rh#1278201 - ImportError: No module named 'pygtk' diff --git a/sources b/sources index 1731483..2a64f83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c19924f32bd875fa47c862e73971b344 fonttools-3.2.2.zip +ec17c59b50518b093bf529be49adf9be fonttools-3.2.3.zip