From 787a08909f4b626d708b5a4091d46c4f2b68f48f Mon Sep 17 00:00:00 2001
From: gbcox <gbcox@bzb.us>
Date: Fri, 17 Jun 2022 09:03:38 -0700
Subject: [PATCH] Upstream release rhbz#2098220

---
 .gitignore           |  1 +
 rhbz2095489.patch    | 12 ------------
 sources              |  2 +-
 yubikey-manager.spec | 14 ++++++++------
 4 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 rhbz2095489.patch

diff --git a/.gitignore b/.gitignore
index 2c53815..0ef9d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /yubikey-manager-bf45dadd33fbe67f6fc0ce57057debced6830ee2.tar.gz
 /yubikey-manager-9f342bc1501f7d6d5581166fbf9a2ab5fef6e556.tar.gz
 /yubikey-manager-6a61db55a316aec374de8e80950918331bcc33d6.tar.gz
+/yubikey-manager-21d351303647fc82d7a999a687f019749cbda80b.tar.gz
diff --git a/rhbz2095489.patch b/rhbz2095489.patch
deleted file mode 100644
index 8347371..0000000
--- a/rhbz2095489.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN yubikey-manager-6a61db55a316aec374de8e80950918331bcc33d6/pyproject.toml yubikey-manager-6a61db55a316aec374de8e80950918331bcc33d6.new/pyproject.toml
---- yubikey-manager-6a61db55a316aec374de8e80950918331bcc33d6/pyproject.toml	2022-01-31 03:26:02.000000000 -0800
-+++ yubikey-manager-6a61db55a316aec374de8e80950918331bcc33d6.new/pyproject.toml	2022-06-10 08:57:36.109909910 -0700
-@@ -32,7 +32,7 @@
- cryptography = ">=2.1, <39"
- pyOpenSSL = {version = ">=0.15.1", optional = true}
- pyscard = "^1.9 || ^2.0"
--fido2 = ">=0.9, <1.0"
-+fido2 = ">=0.9, <2.0"
- click = "^6.0 || ^7.0 || ^8.0"
- pywin32 = {version = ">=223", platform = "win32"}
- 
diff --git a/sources b/sources
index 6e1709f..89eb3b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (yubikey-manager-6a61db55a316aec374de8e80950918331bcc33d6.tar.gz) = a551ad38fc311f4a26efddccd0c6056b2c69a110680bd3fbaa0a6c98ae3228bebbbd5089c584acf4264b308cb44a092fa9537dce806f7e54bc71520cdddf2941
+SHA512 (yubikey-manager-21d351303647fc82d7a999a687f019749cbda80b.tar.gz) = 2a78af7a6192bd98bc9c1d3515688a1beee760816e79aebd5b12265a456a4d54c586cc15071409c7e512e6171a1e58e97c21a2fe6580b16bad27065678ffc343
diff --git a/yubikey-manager.spec b/yubikey-manager.spec
index d600fc2..cf4776d 100644
--- a/yubikey-manager.spec
+++ b/yubikey-manager.spec
@@ -1,18 +1,17 @@
 %global forgeurl https://github.com/Yubico/yubikey-manager/
-%global commit 6a61db55a316aec374de8e80950918331bcc33d6
+%global commit 21d351303647fc82d7a999a687f019749cbda80b
 
 Name:           yubikey-manager
-Version:        4.0.8
+Version:        4.0.9
+Release:        1%{?dist}
+Summary:        Python library and command line tool for configuring a YubiKey
+License:        BSD
 
 %forgemeta
 
-Release:        4%{?dist}
-Summary:        Python library and command line tool for configuring a YubiKey
-License:        BSD
 URL:            %{forgeurl}
 Source0:        %{forgesource}
 Source1:        %{name}.rpmlintrc
-Patch0:         rhbz2095489.patch
 
 BuildArch:      noarch
 BuildRequires:  swig pcsc-lite-devel ykpers pyproject-rpm-macros
@@ -60,6 +59,9 @@ Python library for configuring a YubiKey.
 %{_bindir}/ykman
 
 %changelog
+* Fri Jun 17 2022 Gerald Cox <gbcox@member.fsf.org> - 4.0.9-1
+- Upstream release rhbz#2098220
+
 * Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 4.0.8-4
 - Rebuilt for Python 3.11