diff --git a/python-tldextract.changes b/python-tldextract.changes
index a023b69..f173002 100644
--- a/python-tldextract.changes
+++ b/python-tldextract.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb  4 20:10:10 UTC 2021 - Benjamin Greiner <code@bnavigator.de>
+
+- Fix python-rpm-macros singlespec glitches:
+  * The versions go inside python_module
+  * The obsoletion of the old python2 package did not work with
+    the python_subpackages rewrite
+
 -------------------------------------------------------------------
 Sat Nov 28 20:13:57 UTC 2020 - Mia Herkt <mia@0x0.st>
 
diff --git a/python-tldextract.spec b/python-tldextract.spec
index 17c20e0..7892fe0 100644
--- a/python-tldextract.spec
+++ b/python-tldextract.spec
@@ -16,8 +16,9 @@
 #
 
 
-%define skip_python2 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
+%define oldpython python
 Name:           python-tldextract
 Version:        3.1.0
 Release:        0
@@ -27,16 +28,17 @@ Group:          Development/Languages/Python
 URL:            https://github.com/john-kurkowski/tldextract
 Source:         https://files.pythonhosted.org/packages/source/t/tldextract/tldextract-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
-### BEGIN test requirements
-BuildRequires:  %{python_module filelock} >= 3.0.8
-BuildRequires:  %{python_module pytest-mock}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module requests-file} >= 1.4
-BuildRequires:  %{python_module requests} >= 2.1.0
-BuildRequires:  %{python_module responses}
-### END test requirements
+BuildRequires:  %{python_module filelock >= 3.0.8}
+BuildRequires:  %{python_module idna >= 2.1.0}
+BuildRequires:  %{python_module requests-file >= 1.4}
+BuildRequires:  %{python_module requests >= 2.1.0}
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module setuptools}
+### SECTION test requirements
+BuildRequires:  %{python_module pytest-mock}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module responses}
+### /SECTION test requirements
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-filelock >= 3.0.8
@@ -46,7 +48,7 @@ Requires:       python-requests-file >= 1.4
 Requires:       python-setuptools
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-Obsoletes:      python-tldextract <= 2.0.1
+Obsoletes:      %{oldpython}-tldextract <= 2.0.1
 BuildArch:      noarch
 %python_subpackages