diff --git a/no-setuptools-lint.patch b/no-setuptools-lint.patch
deleted file mode 100644
index da31592..0000000
--- a/no-setuptools-lint.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: pynput-1.7.3/setup.py
-===================================================================
---- pynput-1.7.3.orig/setup.py
-+++ pynput-1.7.3/setup.py
-@@ -23,7 +23,6 @@ RUNTIME_PACKAGES = [
- 
- #: Additional requirements used during setup
- SETUP_PACKAGES = [
--    'setuptools-lint >=0.5',
-     'sphinx >=1.3.1']
- 
- #: Packages requires for different environments
diff --git a/python-pynput.changes b/python-pynput.changes
index fac56d8..890e424 100644
--- a/python-pynput.changes
+++ b/python-pynput.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Aug 13 01:48:04 UTC 2023 - Greg Freemyer <Greg.Freemyer@gmail.com>
+
+- boo#1214205 shows the spec file has some serious issues
+- This package was not using the latest python packaging guidelines
+- I basically re-did it from scratch
+
 -------------------------------------------------------------------
 Fri Apr 28 13:43:30 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
 
diff --git a/python-pynput.spec b/python-pynput.spec
index ea4349f..4f7b4ed 100644
--- a/python-pynput.spec
+++ b/python-pynput.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pynput
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,52 +15,54 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%global skip_python2 1
-%global pythons %{primary_python}
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%{?sle15_python_module_pythons}
+
 Name:           python-pynput
 Version:        1.7.6
 Release:        0
-License:        LGPL-3.0
 Summary:        Monitor and control user input devices
-Url:            https://github.com/moses-palmer/pynput
+License:        LGPL-3.0-only
+URL:            https://github.com/moses-palmer/pynput
 Source:         https://files.pythonhosted.org/packages/source/p/pynput/pynput-%{version}.tar.gz
-Patch0:         unicode.patch
-Patch1:         no-setuptools-lint.patch
-BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module Sphinx >= 1.3.1}
+BuildRequires:  %{python_module pip}
+# this is part of the auto generated spec file, but opensuse
+# BuildRequires:  %%{python_module setuptools-lint >= 0.5}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module evdev}
+BuildRequires:  %{python_module python-xlib}
 BuildRequires:  %{python_module six}
-BuildRequires:  python3-Sphinx >= 1.3.1
+BuildRequires:  %{python_module wheel}
+BuildRequires:  python-rpm-macros
 # SECTION test requirements
-BuildRequires:  %{python_module six}
 # /SECTION
 BuildRequires:  fdupes
-Requires:       python-six
-Suggests:       python-evdev >= 1.3
-Suggests:       python-python-xlib >= 0.17
-Suggests:       python-pyobjc-framework-Quartz >= 7.0
+Requires:       %{python_module evdev >= 1.3}
+Requires:       %{python_module six}
+Suggests:       %{python_module enum34}
+Suggests:       %{python_module pyobjc-framework-ApplicationServices >= 8.0}
+Suggests:       %{python_module pyobjc-framework-Quartz >= 8.0}
 BuildArch:      noarch
-
 %python_subpackages
 
 %description
 Monitor and control user input devices
 
 %prep
-%setup -q -n pynput-%{version}
-%autopatch -p1
+%autosetup -p1 -n pynput-%{version}
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %files %{python_files}
-%license COPYING.LGPL
 %doc README.rst
-%{python_sitelib}/*
+%license COPYING.LGPL
+%{python_sitelib}/pynput
+%{python_sitelib}/pynput-%{version}.dist-info
 
 %changelog
diff --git a/unicode.patch b/unicode.patch
deleted file mode 100644
index da6fa0b..0000000
--- a/unicode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: pynput-1.7.6/lib/pynput/_info.py
-===================================================================
---- pynput-1.7.6.orig/lib/pynput/_info.py	2022-01-01 20:57:22.000000000 +0100
-+++ pynput-1.7.6/lib/pynput/_info.py	2023-04-23 18:22:28.036346734 +0200
-@@ -1,6 +1,6 @@
- # coding=utf-8
- # pystray
--# Copyright (C) 2015-2022 Moses Palmér
-+# Copyright (C) 2015-2022 Moses Palmer
- #
- # This program is free software: you can redistribute it and/or modify it under
- # the terms of the GNU Lesser General Public License as published by the Free
-@@ -15,5 +15,5 @@
- # You should have received a copy of the GNU Lesser General Public License
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
- 
--__author__ = u'Moses Palmér'
-+__author__ = u'Moses Palmer'
- __version__ = (1, 7, 6)