From 20f6e3b254832f881a6210fd1cf3d7adc402b531 Mon Sep 17 00:00:00 2001
From: Athos Ribeiro <athoscr@fedoraproject.org>
Date: Jul 28 2019 14:48:35 +0000
Subject: Update version to 4.0.0


* Skip test suite due to missing dependencies: xmldiff, ufoNormalizer
* Use sources from pypi
* Drop v2 patches
* Drop all Requires in favor of auto generated dependencies

Signed-off-by: Athos Ribeiro <athoscr@fedoraproject.org>

---

diff --git a/.gitignore b/.gitignore
index f5b8934..9feaa17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /glyphsLib-1.7.5.tar.gz
 /glyphsLib-2.2.1.tar.gz
+/glyphsLib-4.0.0.zip
diff --git a/python-glyphsLib.spec b/python-glyphsLib.spec
index 9e0afff..e8cab4e 100644
--- a/python-glyphsLib.spec
+++ b/python-glyphsLib.spec
@@ -1,16 +1,14 @@
 %global srcname glyphsLib
+%global with_check 0
 
 Name:           python-%{srcname}
-Version:        2.2.1
-Release:        8%{?dist}
+Version:        4.0.0
+Release:        1%{?dist}
 Summary:        A bridge from Glyphs source files to UFOs
 
 License:        ASL 2.0
 URL:            https://pypi.org/project/%{srcname}
-Source0:        https://github.com/googlei18n/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz
-
-# Use sys.executable to execute the tests
-Patch0:         sys-executable.patch
+Source0:        %pypi_source %srcname %version zip
 
 BuildArch:      noarch
 
@@ -24,21 +22,20 @@ Summary:        %{summary}
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-setuptools_scm
+
+%if 0%{with_check}
+# missing (xmldiff, ufoNormalizer)
 BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest-runner
 BuildRequires:  python3-fonttools
 BuildRequires:  python3-defcon
-BuildRequires:  python3-mutatormath
-BuildRequires:  python3-mock
-Requires: python3-fonttools
-Requires: python3-defcon
-Requires: python3-mutatormath
+%endif
 
 %description -n python3-%{srcname}
 This library provides a bridge from Glyphs source files (.glyphs) to UFOs
 (Unified Font Object).
 
-
 %prep
 %autosetup -n %{srcname}-%{version} -p1
 
@@ -48,8 +45,11 @@ This library provides a bridge from Glyphs source files (.glyphs) to UFOs
 %install
 %py3_install
 
+# Skipping check for now due to missing dependencies
+%if 0%{?with_check}
 %check
 %{__python3} setup.py test
+%endif
 
 %files -n python3-%{srcname}
 %license LICENSE
@@ -58,8 +58,16 @@ This library provides a bridge from Glyphs source files (.glyphs) to UFOs
 %{python3_sitelib}/%{srcname}-*.egg-info
 %{python3_sitelib}/%{srcname}/*
 %{_bindir}/glyphs2ufo
+%{_bindir}/ufo2glyphs
 
 %changelog
+* Sun Jul 28 2019 Athos Ribeiro <athoscr@fedoraproject.org> - 4.0.0-1
+- Update version
+- Skip test suite due to missing test dependencies (xmldiff, ufoNormalizer)
+- Use sources from pypi
+- Drop v2 patches
+- Drop all Requires in favor of auto generated dependencies
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 9c3f933..f332fcd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glyphsLib-2.2.1.tar.gz) = f048b7aa25f8775040cbeb4e42ec20d35423cba22d6c915f5aca8113503f66479f39351fedfb7a018e1d4cae5f1345adb15a6de40d872d03a301b90671c7e8f0
+SHA512 (glyphsLib-4.0.0.zip) = cd6840b43007491b7c8da93ab5ae9776bedddef1f3cd689d9b6333234092f60759bd2880a6a41447a77aa8868f198a533579fb070ded46f50fd4fd239640abd7
diff --git a/sys-executable.patch b/sys-executable.patch
deleted file mode 100644
index 88b2485..0000000
--- a/sys-executable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/main_test.py b/tests/main_test.py
-index 30b4771..66cda31 100644
---- a/tests/main_test.py
-+++ b/tests/main_test.py
-@@ -19,6 +19,7 @@ from __future__ import (print_function, division, absolute_import,
- 
- import unittest
- import subprocess
-+import sys
- import os
- 
- import test_helpers
-@@ -34,7 +35,7 @@ class MainTest(unittest.TestCase, test_helpers.AssertLinesEqual):
-         with open(filename) as f:
-             expected = f.read()
-         out = subprocess.check_output(
--            ['python', '-m', 'glyphsLib.parser', filename],
-+            [sys.executable, '-m', 'glyphsLib.parser', filename],
-             universal_newlines=True)  # Windows gives \r\n otherwise
-         self.assertLinesEqual(
-             str(expected.splitlines()),