diff --git a/17.patch b/17.patch
deleted file mode 100644
index 3d82d9d..0000000
--- a/17.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 52a68f3d1dd3568dd399ec10b1e5029d0889397d Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Tue, 27 May 2025 08:33:05 -0400
-Subject: [PATCH] Drop pytest-runner and "setup.py test" support
-
----
- setup.py | 4 ++--
- tox.ini  | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0f003dd..9476806 100755
---- a/setup.py
-+++ b/setup.py
-@@ -19,8 +19,8 @@ def _autogen(*args, **kwargs):
-     author_email='miro@hroncok.cz',
-     url='https://github.com/admesh/python-admesh',
-     license='GPLv2+',
--    setup_requires=['Cython>=0.22', 'pytest-runner'],
--    tests_require=['pytest'],
-+    setup_requires=['Cython>=0.22'],
-+    extras_require={'test': ['pytest']},
-     packages=find_packages(),
-     cmdclass={'build_ext': _autogen},
-     ext_modules=[Extension("admesh", ["admesh.pyx"], libraries=["admesh"])],
-diff --git a/tox.ini b/tox.ini
-index b41f291..3e0e723 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -2,7 +2,8 @@
- envlist = py37,py36,py35,py34,py27,pypy3,pypy
- [testenv]
- deps=Cython
--commands=python setup.py test
-+extras=test
-+commands=pytest
- passenv =
-   CFLAGS
-   LDFLAGS
diff --git a/python-admesh.spec b/python-admesh.spec
index 9c36a0d..286a044 100644
--- a/python-admesh.spec
+++ b/python-admesh.spec
@@ -1,66 +1,68 @@
-Name:           python-admesh
+%global pypi_name admesh
+
+Name:           python-%{pypi_name}
 Version:        0.98.9
 Release:        %autorelease
 Summary:        Python bindings for ADMesh, STL manipulation library
 
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
 License:        GPL-2.0-or-later
 URL:            https://github.com/admesh/python-admesh
-Source0:        https://files.pythonhosted.org/packages/source/a/admesh/admesh-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 
 # https://github.com/admesh/python-admesh/issues/15
 Source1:        %{url}/raw/v%{version}/test/utils.py
 
-# Drop pytest-runner and "setup.py test" support
-# https://github.com/admesh/python-admesh/pull/17
-# https://fedoraproject.org/wiki/Changes/DeprecatePythonPytestRunner
-Patch:          %{url}/pull/17.patch
-
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
-ExcludeArch:    %{ix86}
-%endif
-
 BuildRequires:  gcc
 
 BuildRequires:  admesh-devel >= 0.98
 
 BuildRequires:  python3-devel
+BuildRequires:  python3-pytest
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-Cython
+BuildRequires:  python3-pytest-runner
 
 %description
 This module provides bindings for the ADMesh library.
 It lets you manipulate 3D models in binary or ASCII STL
 format and partially repair them if necessary.
 
-%package -n     python3-admesh
+%package -n     python3-%{pypi_name}
 Summary:        Python 3 bindings for ADMesh, STL manipulation library
+%{?python_provide:%python_provide python3-%{pypi_name}}
 
-%description -n python3-admesh
+Obsoletes:      python2-%{pypi_name} < 0.98.8-2
+Obsoletes:      python-%{pypi_name} < 0.98.8-2
+
+%description -n python3-%{pypi_name}
 This module provides bindings for the ADMesh library.
 It lets you manipulate 3D models in binary or ASCII STL
 format and partially repair them if necessary.
 
 
 %prep
-%autosetup -n admesh-%{version} -p1
+%setup -q -n %{pypi_name}-%{version}
 cp %{SOURCE1} test/
 
-%generate_buildrequires
-%pyproject_buildrequires -x test
-
 %build
-%pyproject_wheel
+%py3_build
 
 
 %install
-%pyproject_install
-%pyproject_save_files -l admesh
+%py3_install
 
 %check
-%pyproject_check_import
-%pytest -v
+PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v \
+%ifarch ppc64
+  -k "not test_saved_equals_original_binary" # likely a bug in admesh itself
+%endif
 
-%files -n python3-admesh -f %{pyproject_files}
+%files -n python3-%{pypi_name}
 %doc README.rst
+%license COPYING
+%attr(0755,root,root) %{python3_sitearch}/%{pypi_name}.*.so
+%{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
 
 
 %changelog