diff --git a/python-numpy.changes b/python-numpy.changes
index 0c7103a..003a22c 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 11 08:27:00 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Revert some spec-cleaner "Verschlimmbesserungen"
+- Remove old unused directives for Python <=3.6 from specfile
+
 -------------------------------------------------------------------
 Fri Sep 30 23:43:53 UTC 2022 - Arun Persaud <arun@gmx.de>
 
diff --git a/python-numpy.spec b/python-numpy.spec
index fa2249f..3cd2fb1 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -32,15 +32,15 @@
  %define c_f_ver 7
  %bcond_without hpc
 %endif
+%if %{with hpc}
+ %bcond_without openblas
+%endif
 %if 0%{?sle_version} == 120300
 %{?with_openblas:ExclusiveArch:  do_not_build}
 %endif
 %ifarch s390 s390x
 %{?with_openblas:ExclusiveArch:  do_not_build}
 %endif
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define         skip_python2 1
-%define         skip_python36 1
 %{?with_hpc:%{hpc_requires}}
 #
 %if 0%{?suse_version} > 1500
@@ -48,10 +48,9 @@
 %else
 %bcond_with libalternatives
 %endif
+#
 %bcond_with ringdisabled
-%if %{with hpc}
- %bcond_without openblas
-%endif
+#
 %if %{without hpc}
 %define package_name %{pname}
 %define p_python_sitearch %{python_sitearch}
@@ -70,6 +69,33 @@
 ExclusiveArch:  do_not_build
 %endif
 %endif
+Name:           %{package_name}
+# set %%ver and %%_ver instead above
+Version:        %{ver}
+Release:        0
+Summary:        NumPy array processing for numbers, strings, records and objects
+License:        BSD-3-Clause
+URL:            http://www.numpy.org/
+Source:         https://files.pythonhosted.org/packages/source/n/numpy/numpy-%{version}.tar.gz
+Source99:       python-numpy-rpmlintrc
+# PATCH-FIX-OPENSUSE numpy-buildfix.patch -- openSUSE-specific build fixes
+Patch0:         numpy-buildfix.patch
+# PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure
+Patch1:         numpy-1.9.0-remove-__declspec.patch
+BuildRequires:  %{python_module Cython >= 0.29.30}
+BuildRequires:  %{python_module base >= 3.8}
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module hypothesis >= 6.24.1}
+BuildRequires:  %{python_module pytest >= 6.2.5}
+BuildRequires:  %{python_module pytest-xdist}
+BuildRequires:  %{python_module setuptools >= 60.0.0}
+BuildRequires:  %{python_module testsuite}
+BuildRequires:  gcc-c++
+BuildRequires:  python-rpm-macros >= 20210929
+BuildConflicts: gcc11 < 11.2
+%if 0%{?suse_version}
+BuildRequires:  fdupes
+%endif
 %if %{without hpc}
 # Last version which packaged %%{_bindir}/f2py without update-alternatives
 # Protect it from substitution
@@ -103,33 +129,6 @@ BuildRequires:  lua-lmod
 BuildRequires:  suse-hpc
 Requires:       libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc
 %endif
-Name:           %{package_name}
-# set %%ver and %%_ver instead above
-Version:        %{ver}
-Release:        0
-Summary:        NumPy array processing for numbers, strings, records and objects
-License:        BSD-3-Clause
-URL:            http://www.numpy.org/
-Source:         https://files.pythonhosted.org/packages/source/n/numpy/numpy-%{version}.tar.gz
-Source99:       python-numpy-rpmlintrc
-# PATCH-FIX-OPENSUSE numpy-buildfix.patch -- openSUSE-specific build fixes
-Patch0:         numpy-buildfix.patch
-# PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure
-Patch1:         numpy-1.9.0-remove-__declspec.patch
-BuildRequires:  %{python_module Cython >= 0.29.30}
-BuildRequires:  %{python_module base >= 3.8}
-BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module hypothesis >= 6.24.1}
-BuildRequires:  %{python_module pytest >= 6.2.5}
-BuildRequires:  %{python_module pytest-xdist}
-BuildRequires:  %{python_module setuptools >= 60.0.0}
-BuildRequires:  %{python_module testsuite}
-BuildRequires:  gcc-c++
-BuildRequires:  python-rpm-macros >= 20210929
-BuildConflicts: gcc11 < 11.2
-%if 0%{?suse_version}
-BuildRequires:  fdupes
-%endif
 %python_subpackages
 
 %description