diff --git a/python39.changes b/python39.changes
index 419c110..aee4e15 100644
--- a/python39.changes
+++ b/python39.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sat Dec 12 14:29:33 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Update sphinx-update-removed-function.patch patch to the latest
+  version in python36.
+
+-------------------------------------------------------------------
+Thu Dec 10 00:26:51 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Last try before this results in an editwar:
+  * remove importlib_resources and importlib-metadata 
+    provides/obsoletes
+  * import importlib_resources is not the same as
+    import importlib.resources, same for metadata
+  * The backport packages from PyPI needed for older flavors are
+    specified as such for setuptools or in pyproject.toml. If a
+    package requires them they typically add them with a python
+    version qualifier and the packages have their own version
+    numbers.
+
 -------------------------------------------------------------------
 Sat Dec  5 16:55:12 UTC 2020 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python39.spec b/python39.spec
index 49d3638..1c044af 100644
--- a/python39.spec
+++ b/python39.spec
@@ -291,10 +291,6 @@ Provides:       %{python_pkg_name}-asyncio = %{version}
 Provides:       %{python_pkg_name}-typing = %{version}
 # python3-xml was merged into python3, now moved into -base
 Provides:       %{python_pkg_name}-xml = %{version}
-# python-importlib-metadata was specifical project which was merged into 3.8
-Provides:       %{python_pkg_name}-importlib-metadata = %{version}
-# python-importlib_resources is a backport of 3.7 behaviour into older pythons
-Provides:       %{python_pkg_name}-importlib_resources = %{version}
 %if %{primary_interpreter}
 Provides:       python3-asyncio = %{version}
 Provides:       python3-base = %{version}
@@ -303,10 +299,6 @@ Provides:       python3-typing = %{version}
 Obsoletes:      python3-typing < %{version}
 Provides:       python3-xml = %{version}
 Obsoletes:      python3-xml < %{version}
-Provides:       python3-importlib-metadata = %{version}
-Obsoletes:      python3-importlib-metadata < %{version}
-Provides:       python3-importlib_resources = %{version}
-Obsoletes:      python3-importlib_resources < %{version}
 %endif
 
 %description -n %{python_pkg_name}-base
diff --git a/sphinx-update-removed-function.patch b/sphinx-update-removed-function.patch
index 105f6a2..17bc498 100644
--- a/sphinx-update-removed-function.patch
+++ b/sphinx-update-removed-function.patch
@@ -1,12 +1,6 @@
-From 960bb883769e5c64a63b014590d75654db87ffb0 Mon Sep 17 00:00:00 2001
-From: Pablo Galindo <Pablogsal@gmail.com>
-Date: Fri, 10 May 2019 22:58:17 +0100
-Subject: [PATCH] Fix sphinx deprecation warning about env.note_versionchange()
- (GH-13236)
-
 ---
- Doc/tools/extensions/pyspecific.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Doc/tools/extensions/pyspecific.py |    6 ++++++
+ 1 file changed, 6 insertions(+)
 
 --- a/Doc/tools/extensions/pyspecific.py
 +++ b/Doc/tools/extensions/pyspecific.py
@@ -15,12 +9,12 @@ Subject: [PATCH] Fix sphinx deprecation warning about env.note_versionchange()
              node.append(para)
          env = self.state.document.settings.env
 -        env.get_domain('changeset').note_changeset(node)
-+        # new method
-+        if hasattr(env, 'get_domain'):
-+            env.get_domain('changeset').note_changeset(node)
 +        # deprecated pre-Sphinx-2 method
-+        else:
++        if hasattr(env, 'note_versionchange'):
 +            env.note_versionchange('deprecated', version[0], node, self.lineno)
++        # new method
++        else:
++            env.get_domain('changeset').note_changeset(node)
          return [node] + messages