From 871bd6a6299ca39c80518ad740944584db881c8d Mon Sep 17 00:00:00 2001
From: gbcox <gbcox@bzb.us>
Date: Wed, 3 Feb 2021 15:44:08 -0800
Subject: [PATCH] Upstream release rhbz#1921519

---
 .gitignore           |  1 +
 sources              |  2 +-
 yubikey-manager.spec | 23 ++++++++++++++++-------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15816d4..96fcf86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /yubikey-manager-1f22620.tar.gz
 /yubikey-manager-87dd1d8.tar.gz
 /yubikey-manager-ba049e1454a2435e4772b17fec88785a50373cf9.tar.gz
+/yubikey-manager-75e0d3680e5d2537f024e8c24ef65cce752d453b.tar.gz
diff --git a/sources b/sources
index 4f1da86..a7a23cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (yubikey-manager-ba049e1454a2435e4772b17fec88785a50373cf9.tar.gz) = 16375620df6656628c43bfb1074273e6733cdf2c723c7e552711b9bb1cd52fd62b0c57a07aeff9d0ccaed38e8762f89bd953cb7d692af2e419945c4c20556cfb
+SHA512 (yubikey-manager-75e0d3680e5d2537f024e8c24ef65cce752d453b.tar.gz) = f6be0b2332215eba3084fbebb0fec47807fa21750075d49164135ed78a4421cf282b63ea79822e6de96646357d6c47d0d9735fb6e75a9139a9bfd9eeb942db53
diff --git a/yubikey-manager.spec b/yubikey-manager.spec
index 47d905c..4f3e007 100644
--- a/yubikey-manager.spec
+++ b/yubikey-manager.spec
@@ -1,10 +1,10 @@
 %{?python_enable_dependency_generator}
 %global forgeurl https://github.com/Yubico/yubikey-manager/
-%global commit ba049e1454a2435e4772b17fec88785a50373cf9
+%global commit 75e0d3680e5d2537f024e8c24ef65cce752d453b
 
 Name:           yubikey-manager
-Version:        3.1.2
-Release:        2%{?dist}
+Version:        4.0.0a1
+Release:        1%{?dist}
 Summary:        Python library and command line tool for configuring a YubiKey
 
 %forgemeta
@@ -18,6 +18,7 @@ Source1:        %{name}.rpmlintrc
 
 BuildArch:      noarch
 BuildRequires:  python3-devel swig pcsc-lite-devel ykpers python3-setuptools
+BuildRequires:  python3-poetry-core pyproject-rpm-macros tox python-tox-current-env
 # install_requires from setup.py
 BuildRequires:  %{py3_dist six pyscard pyusb click cryptography pyopenssl fido2}
 Requires:       python3-%{name} python3-setuptools u2f-hidraw-policy
@@ -25,6 +26,9 @@ Requires:       python3-%{name} python3-setuptools u2f-hidraw-policy
 %description
 Command line tool for configuring a YubiKey.
 
+%generate_buildrequires
+%pyproject_buildrequires
+
 %package -n python3-%{name}
 Summary:        Python library for configuring a YubiKey
 Requires:       ykpers pcsc-lite
@@ -39,13 +43,15 @@ Python library for configuring a YubiKey.
 %autosetup -n %{archivename}
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
 
-%check
-%{__python3} setup.py test
+# Remove tests temporarily for early alpha code
+# Rawhide / F34 code only
+# check
+# tox
 
 %files -n python3-%{name}
 %license COPYING
@@ -56,6 +62,9 @@ Python library for configuring a YubiKey.
 %{_bindir}/ykman
 
 %changelog
+* Wed Feb 03 2021 Gerald Cox <gbcox@fedoraproject.org> - 4.0.0a1
+- Upstream release rhbz#1921519
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild