diff --git a/no-legacyversion-warning.patch b/no-legacyversion-warning.patch
new file mode 100644
index 0000000..bfa7a8f
--- /dev/null
+++ b/no-legacyversion-warning.patch
@@ -0,0 +1,30 @@
+--- packaging-20.9/packaging/specifiers.py
++++ packaging-20.9/packaging/specifiers.py
+@@ -280,12 +280,6 @@
+         # type: (str, Optional[bool]) -> None
+         super(LegacySpecifier, self).__init__(spec, prereleases)
+ 
+-        warnings.warn(
+-            "Creating a LegacyVersion has been deprecated and will be "
+-            "removed in the next major release",
+-            DeprecationWarning,
+-        )
+-
+     def _coerce_version(self, version):
+         # type: (Union[ParsedVersion, str]) -> LegacyVersion
+         if not isinstance(version, LegacyVersion):
+--- packaging-20.9/packaging/version.py
++++ packaging-20.9/packaging/version.py	
+@@ -124,12 +124,6 @@
+         self._version = str(version)
+         self._key = _legacy_cmpkey(self._version)
+ 
+-        warnings.warn(
+-            "Creating a LegacyVersion has been deprecated and will be "
+-            "removed in the next major release",
+-            DeprecationWarning,
+-        )
+-
+     def __str__(self):
+         # type: () -> str
+         return self._version
diff --git a/python-packaging.changes b/python-packaging.changes
index 70fda87..797944f 100644
--- a/python-packaging.changes
+++ b/python-packaging.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jun 17 17:28:43 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Add Provides: for python*dist(packaging): work around boo#1186870 
+- skip tests failing because of no-legacyversion-warning.patch
+
+-------------------------------------------------------------------
+Sat May  1 21:03:52 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- add no-legacyversion-warning.patch to restore compatibility with 20.4 
+
 -------------------------------------------------------------------
 Tue Feb  2 01:02:21 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-packaging.spec b/python-packaging.spec
index 56bd30b..76317c9 100644
--- a/python-packaging.spec
+++ b/python-packaging.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-packaging
+# spec file
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -25,6 +25,8 @@
 %define psuffix %{nil}
 %bcond_with test
 %endif
+# in order to avoid rewriting for subpackage generator
+%define mypython python
 Name:           python-packaging%{psuffix}
 Version:        20.9
 Release:        0
@@ -32,6 +34,8 @@ Summary:        Core utilities for Python packages
 License:        Apache-2.0
 URL:            https://github.com/pypa/packaging
 Source:         https://files.pythonhosted.org/packages/source/p/packaging/packaging-%{version}.tar.gz
+# Restore compatibility with 20.4 for setuptools
+Patch1:         no-legacyversion-warning.patch
 BuildRequires:  %{python_module six}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -48,6 +52,11 @@ BuildRequires:  %{python_module pretend}
 BuildRequires:  %{python_module pyparsing >= 2.0.2}
 BuildRequires:  %{python_module pytest}
 %endif
+# work around boo#1186870
+Provides:       %{mypython}%{python_version}dist(packaging) = %{version}-%{release}
+%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
+Provides:       %{mypython}3dist(packaging) = %{version}-%{release}
+%endif
 %python_subpackages
 
 %description
@@ -55,6 +64,7 @@ Core utilities for Python packages
 
 %prep
 %setup -q -n packaging-%{version}
+%patch1 -p1
 # sdist must provide a packaging.egg-info, used below in install phase
 test -d packaging.egg-info
 
@@ -63,7 +73,9 @@ test -d packaging.egg-info
 
 %if %{with test}
 %check
-%pytest
+# no-legacyversion-warning.patch causes these to fail
+%pytest -k "not (test_legacy_specifier_is_deprecated or test_legacy_version_is_deprecated)"
+
 %endif # %%{with_test}
 
 %if !%{with test}