From 2bfc105583464e98638c5f6157ebe7dbd7a558cfc367f014ece65fddf9eea7d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 16 Oct 2019 14:23:15 +0000
Subject: [PATCH] - Do not pull in setuptools dependency at all to avoid cycles

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=66
---
 python-pyparsing.changes |  5 +++++
 python-pyparsing.spec    | 20 ++++++--------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/python-pyparsing.changes b/python-pyparsing.changes
index a154260..7111ad9 100644
--- a/python-pyparsing.changes
+++ b/python-pyparsing.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 16 14:22:35 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Do not pull in setuptools dependency at all to avoid cycles
+
 -------------------------------------------------------------------
 Tue Aug  6 05:01:32 UTC 2019 - Thomas Bechtold <tbechtold@suse.com>
 
diff --git a/python-pyparsing.spec b/python-pyparsing.spec
index 089cda0..c0ef8b2 100644
--- a/python-pyparsing.spec
+++ b/python-pyparsing.spec
@@ -32,26 +32,15 @@ Version:        2.4.2
 Release:        0
 Summary:        Grammar Parser Library for Python
 License:        MIT AND GPL-2.0-or-later AND GPL-3.0-or-later
-Group:          Development/Languages/Python
 URL:            https://github.com/pyparsing/pyparsing/
-# Upstream tarball from the master branch with gh#pyparsing/pyparsing#47
 Source:         https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz
-# Source:         pyparsing-%{version}.tar.xz
 BuildRequires:  %{python_module base}
-BuildRequires:  %{python_module setuptools}
-%if "%{flavor}" == "test"
-# Not necessary for python3, but tests fail with the standard unittest
-# and python 2.7
-BuildRequires:  %{python_module unittest2}
-%endif
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-#!BuildIgnore:  python2-pyparsing
-#!BuildIgnore:  python3-pyparsing
-# do not add dependencies on setuptools and ideally not even full "python";
-# this is now a dependency of setuptools
-Requires:       python-base
 BuildArch:      noarch
+%if %{with test}
+BuildRequires:  %{python_module unittest2}
+%endif
 %ifpython2
 Provides:       %{oldpython}-parsing = %{version}
 Obsoletes:      %{oldpython}-parsing < %{version}
@@ -66,6 +55,9 @@ code uses to construct the grammar directly in Python code.
 
 %prep
 %setup -q -n %{modname}-%{version}
+# do not require setuptools
+# https://github.com/pyparsing/pyparsing/pull/133
+sed -i -e 's:from setuptools :from distutils.core :g' setup.py
 
 %build
 %python_build