From bcfebe8d0bf19da15fe6f2a5ef75bda06f16f395 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Sun, 11 Aug 2019 13:52:52 -0600
Subject: [PATCH] Update to 0.7.0

---
 .gitignore               |  1 +
 python-fido2-setup.patch | 18 ++++++++----------
 python-fido2.spec        | 18 ++++++++++++++++--
 sources                  |  2 +-
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 36a435d..87c361c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /python-python-fido2-0.4.0.tar.gz
 /python-python-fido2-0.5.0.tar.gz
 /python-python-fido2-0.6.0.tar.gz
+/python-python-fido2-0.7.0.tar.gz
diff --git a/python-fido2-setup.patch b/python-fido2-setup.patch
index d704a16..a0853cf 100644
--- a/python-fido2-setup.patch
+++ b/python-fido2-setup.patch
@@ -1,13 +1,11 @@
-diff -up python-fido2-0.6.0/setup.py.orig python-fido2-0.6.0/setup.py
---- python-fido2-0.6.0/setup.py.orig	2019-05-10 04:52:54.000000000 -0600
-+++ python-fido2-0.6.0/setup.py	2019-05-11 14:18:52.328437806 -0600
-@@ -49,9 +49,6 @@ setup(
-         'six',
+diff -up python-fido2-0.7.0/setup.py.orig python-fido2-0.7.0/setup.py
+--- python-fido2-0.7.0/setup.py.orig	2019-08-02 19:40:37.006248254 -0600
++++ python-fido2-0.7.0/setup.py	2019-08-02 19:41:10.502080288 -0600
+@@ -50,7 +50,6 @@ setup(
          'cryptography>=1.5',
      ],
--    extras_require={
--        ':python_version < "3.4"': ['enum34']
--    },
+     extras_require={
+-        ':python_version < "3.4"': ['enum34'],
+         'pcsc': ['pyscard']
+     },
      test_suite='test',
-     tests_require=['mock>=1.0.1', 'pyfakefs>=3.4'],
-     classifiers=[
diff --git a/python-fido2.spec b/python-fido2.spec
index bf38d59..8ce47c4 100644
--- a/python-fido2.spec
+++ b/python-fido2.spec
@@ -11,8 +11,8 @@
 %global srcname fido2
 
 Name:           python-%{srcname}
-Version:        0.6.0
-Release:        2%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        Functionality for FIDO 2.0, including USB device communication
 
 # Main code is BSD
@@ -57,6 +57,7 @@ BuildRequires:  python2-pyfakefs >= 3.4
 %if %{undefined __pythondist_requires}
 Requires:       python2-enum34
 Requires:       python2-cryptography
+Requires:       python2-pyscard
 Requires:       python2-six
 %endif
 %{?python_provide:%python_provide python2-%{srcname}}
@@ -76,6 +77,11 @@ BuildRequires:  python%{python3_pkgversion}-pyfakefs >= 3.4
 %endif
 %if %{undefined __pythondist_requires}
 Requires:       python%{python3_pkgversion}-cryptography
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Recommends:     python%{python3_pkgversion}-pyscard
+%else
+Requires:       python%{python3_pkgversion}-pyscard
+%endif
 Requires:       python%{python3_pkgversion}-six
 %endif
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
@@ -95,6 +101,11 @@ BuildRequires:  python%{python3_other_pkgversion}-pyfakefs >= 3.4
 %endif
 %if %{undefined __pythondist_requires}
 Requires:       python%{python3_other_pkgversion}-cryptography
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Recommends:     python%{python3_other_pkgversion}-pyscard
+%else
+Requires:       python%{python3_other_pkgversion}-pyscard
+%endif
 Requires:       python%{python3_other_pkgversion}-six
 %endif
 %{?python_provide:%python_provide python%{python3_other_pkgversion}-%{srcname}}
@@ -160,6 +171,9 @@ Requires:       python%{python3_other_pkgversion}-six
 
 
 %changelog
+* Sun Aug 11 2019 Orion Poplawski <orion@nwra.com> - 0.7.0-1
+- Update to 0.7.0
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 0978f42..5efd246 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-python-fido2-0.6.0.tar.gz) = 43b66e7af01a0ced6a8b004f9d20e258b59d92af011aa6a695da702c67b49121e1cc216dae74fe4e8446de3a88d606237a67bae3c8893f7ffc3b0d094fd85665
+SHA512 (python-python-fido2-0.7.0.tar.gz) = 02a2d997a4af64c32badbc58e49b40201ce87b0294d6b3d9e85d430356d92d354e6de63d35195f53b4f69f6034342f139efc2c2dfbaf26103711942a4dc74bfb