From 7c37b5bb96cd3f8b1c6460d02b6ff4ee5c5ec388a84f68a0db04a125a4728872 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Fri, 18 Jun 2021 19:35:28 +0000
Subject: [PATCH] Accepting request 900808 from
 home:bnavigator:branches:devel:languages:python

- Add Provides: for python*dist(pyparsing): work around boo#1186870

OBS-URL: https://build.opensuse.org/request/show/900808
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=76
---
 python-pyparsing.changes |  5 +++++
 python-pyparsing.spec    | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/python-pyparsing.changes b/python-pyparsing.changes
index a34c21a..96cc931 100644
--- a/python-pyparsing.changes
+++ b/python-pyparsing.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 17 17:30:40 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Add Provides: for python*dist(pyparsing): work around boo#1186870
+
 -------------------------------------------------------------------
 Wed Jun  3 08:31:39 UTC 2020 - pgajdos@suse.com
 
diff --git a/python-pyparsing.spec b/python-pyparsing.spec
index 0ddd5c1..f88fe3c 100644
--- a/python-pyparsing.spec
+++ b/python-pyparsing.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package python-pyparsing
+# spec file
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,8 @@
 
 
 %define modname pyparsing
-%define oldpython python
+# in order to avoid rewriting for subpackage generator
+%define mypython python
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
@@ -32,7 +33,7 @@ Name:           python-pyparsing%{psuffix}
 Version:        2.4.7
 Release:        0
 Summary:        Grammar Parser Library for Python
-License:        MIT AND GPL-2.0-or-later AND GPL-3.0-or-later
+License:        GPL-2.0-or-later AND MIT AND GPL-3.0-or-later
 URL:            https://github.com/pyparsing/pyparsing/
 Source:         https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz
 BuildRequires:  %{python_module base}
@@ -43,8 +44,13 @@ BuildArch:      noarch
 BuildRequires:  %{python_module pytest}
 %endif
 %ifpython2
-Provides:       %{oldpython}-parsing = %{version}
-Obsoletes:      %{oldpython}-parsing < %{version}
+Provides:       %{mypython}-parsing = %{version}
+Obsoletes:      %{mypython}-parsing < %{version}
+%endif
+# work around boo#1186870
+Provides:       %{mypython}%{python_version}dist(pyparsing) = %{version}
+%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
+Provides:       %{mypython}3dist(pyparsing) = %{version}
 %endif
 %python_subpackages