From 51897b504b78e5d99f518b6ab029c7cfb802ba9fb56cf3ac1f66a69849330f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= <mimi.vx@gmail.com>
Date: Fri, 28 Dec 2018 08:57:58 +0000
Subject: [PATCH] Accepting request 661731 from
 home:pluskalm:branches:devel:languages:python

- Drop pyparsing depndency as its not needed and creates circular
  dependency on older distributions
- Reduce amount of duplicities

OBS-URL: https://build.opensuse.org/request/show/661731
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-packaging?expand=0&rev=21
---
 python-packaging.changes |  7 +++++++
 python-packaging.spec    | 27 ++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/python-packaging.changes b/python-packaging.changes
index d6209bb..ff20ce9 100644
--- a/python-packaging.changes
+++ b/python-packaging.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec 28 08:49:34 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
+
+- Drop pyparsing depndency as its not needed and creates circular
+  dependency on older distributions
+- Reduce amount of duplicities
+
 -------------------------------------------------------------------
 Thu Mar 22 20:37:57 UTC 2018 - toddrme2178@gmail.com
 
diff --git a/python-packaging.spec b/python-packaging.spec
index d3ac816..d07fa9b 100644
--- a/python-packaging.spec
+++ b/python-packaging.spec
@@ -12,25 +12,31 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%bcond_with test
-
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_with test
 Name:           python-packaging
 Version:        17.1
 Release:        0
 Summary:        Core utilities for Python packages
 License:        Apache-2.0
 Group:          Development/Languages/Python
-Url:            https://github.com/pypa/packaging
+URL:            https://github.com/pypa/packaging
 Source:         https://pypi.io/packages/source/p/packaging/packaging-%{version}.tar.gz
 BuildRequires:  %{python_module base}
-BuildRequires:  %{python_module pyparsing >= 2.0.2}
 BuildRequires:  %{python_module six}
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+# older versions produce:
+#   File "/usr/lib/python2.7/site-packages/packaging/requirements.py", line 59, in <module>
+#    MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
+# TypeError: __call__() takes exactly 2 arguments (1 given)
+Requires:       python-pyparsing >= 2.0.2
+Requires:       python-six
+BuildArch:      noarch
 # do not add setuptools dependency, this is now a dependency
 # of setuptools. Ensure that all dependencies also don't depend
 # on setuptools
@@ -39,13 +45,6 @@ BuildRequires:  python-rpm-macros
 BuildRequires:  %{python_module pretend}
 BuildRequires:  %{python_module pytest}
 %endif
-# older versions produce:
-#   File "/usr/lib/python2.7/site-packages/packaging/requirements.py", line 59, in <module>
-#    MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
-# TypeError: __call__() takes exactly 2 arguments (1 given)
-Requires:       python-pyparsing >= 2.0.2
-Requires:       python-six
-BuildArch:      noarch
 %python_subpackages
 
 %description
@@ -63,6 +62,7 @@ Core utilities for Python packages
 %{python_expand rm %{buildroot}%{$python_sitelib}/*.egg-info
 cp -r packaging.egg-info %{buildroot}%{$python_sitelib}/packaging-%{version}-py%{$python_version}.egg-info
 }
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %if %{with test}
 %check
@@ -71,7 +71,8 @@ cp -r packaging.egg-info %{buildroot}%{$python_sitelib}/packaging-%{version}-py%
 
 %files %{python_files}
 %defattr(-,root,root,-)
-%doc CHANGELOG.rst LICENSE README.rst
+%license LICENSE
+%doc CHANGELOG.rst README.rst
 %{python_sitelib}/packaging
 %{python_sitelib}/packaging-%{version}-py*.egg-info/