diff --git a/python-wxPython.changes b/python-wxPython.changes
index eef5966..a199c4d 100644
--- a/python-wxPython.changes
+++ b/python-wxPython.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar 31 01:32:34 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Don't build using Python 3.6 for test package, when that gets reenabled.
+- Since build.py install helpfully installs every built shared object
+  under site-package directories, remove those not for that version of
+  Python. (bsc#1182822)
+- Correct python uninstall alternatives to list all of them, not just one.
+
 -------------------------------------------------------------------
 Wed Sep 30 17:48:02 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
diff --git a/python-wxPython.spec b/python-wxPython.spec
index a9df5e7..6159c9f 100644
--- a/python-wxPython.spec
+++ b/python-wxPython.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-wxPython
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,10 @@
 %else
 %define wx_args --gtk3 -v
 %endif
+%if %{with test}
+# No numpy for Python 3.6
+%define skip_python36 1
+%endif
 Name:           python-wxPython
 Version:        4.1.0
 Release:        0
@@ -75,7 +79,7 @@ BuildRequires:  pkgconfig(xtst)
 %endif
 Requires:       python-six
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 Conflicts:      python-wxWidgets
 Provides:       python-wxWidgets = %{version}
 %if %{with test}
@@ -128,6 +132,9 @@ export DOXYGEN=%{_bindir}/doxygen
 
 %install
 %python_expand $python build.py install %{wx_args} --destdir=%{buildroot} --extra_setup="-O1 --force"
+# build.py install helpfully installs built shared libraries for all versions,
+# so remove those for other versions.
+%{python_expand find %{buildroot}%{$python_sitearch} -name *.so ! -name *cpython-%{$python_version_nodots}*so -delete}
 
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
@@ -173,7 +180,7 @@ mv wx_temp wx
 %{python_install_alternative pywxrc helpviewer img2png img2py img2xpm pycrust pyshell pyslices pyslicesshell wxdemo wxdocs wxget}
 
 %postun
-%python_uninstall_alternative pywxrc
+%{python_uninstall_alternative pywxrc helpviewer img2png img2py img2xpm pycrust pyshell pyslices pyslicesshell wxdemo wxdocs wxget}
 
 %files %{python_files}
 %license LICENSE.txt license/*.txt