From 1a3db998775c080d83e01aac0411048b949444ad Mon Sep 17 00:00:00 2001
From: dvzrv <dvzrv@9fca08f4-af9d-4005-b8df-a31f2cc04f65>
Date: Sun, 13 Feb 2022 23:54:24 +0000
Subject: [PATCH] upgpkg: python-pynitrokey 0.4.16-2: Rebuild to add
 python-spsdk to depends.

Python-spsdk is required for nitrokey3 support.
Unfortunately the spsdk project is problematic in regards to packaging:
https://github.com/Nitrokey/pynitrokey/issues/162
Problems might occur due to required extensive devendoring.

git-svn-id: file:///srv/repos/svn-community/svn@1133102 9fca08f4-af9d-4005-b8df-a31f2cc04f65
---
 trunk/PKGBUILD                                | 17 ++------
 ...ython-pynitrokey-0.4.15-remove_spsdk.patch | 40 -------------------
 2 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 trunk/python-pynitrokey-0.4.15-remove_spsdk.patch

diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 92e140f3d2c4..b0eebd52b07b 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -3,31 +3,22 @@
 _name=pynitrokey
 pkgname=python-pynitrokey
 pkgver=0.4.16
-pkgrel=1
+pkgrel=2
 pkgdesc="A command line interface for the Nitrokey FIDO2 and Nitrokey Start"
 arch=(any)
 url="https://github.com/Nitrokey/pynitrokey"
 license=(Apache)
 depends=(python-cbor python-cffi python-click python-cryptography
 python-dateutil python-ecdsa python-fido2 python-intelhex python-nkdfu
-python-pyusb python-requests python-tqdm python-urllib3)
+python-pyusb python-requests python-spsdk python-tqdm python-urllib3)
 makedepends=(git python-build python-flit python-install)
 source=(
   "git+https://github.com/nitrokey/pynitrokey#tag=v${pkgver}.nitrokey?signed"
-  "${pkgname}-0.4.15-remove_spsdk.patch"
 )
-sha512sums=('SKIP'
-            '4f5abd730bf6c23f69e8d2252b97e729273a0d48fe85708f9ea623afc10ef0d9ac07b25d17479edc3e7da70af0fe3956b4ecf93f3af69392f57974c6b3f76d94')
-b2sums=('SKIP'
-        '133d8770ec99db1ead4e9d175ec84ad229dd8e94c0772f2406e63d6cabf372446ba76814f7f71fc10ba3128ae0be6b5a68e859bf768be44c70ed8b87d12014b9')
+sha512sums=('SKIP')
+b2sums=('SKIP')
 validpgpkeys=(868184069239FF65DE0BCD7DD9BAE35991DE5B22)  # Szczepan Zalega (Nitrokey) <szczepan@nitrokey.com>
 
-prepare() {
-  cd "${_name}"
-  # remove nitrokey3 support for now, until spsdk is packaged: https://github.com/Nitrokey/pynitrokey/issues/162
-  patch -Np1 -i ../"${pkgname}-0.4.15-remove_spsdk.patch"
-}
-
 build() {
   cd "${_name}"
   python -m build --wheel --skip-dependency-check --no-isolation
diff --git a/trunk/python-pynitrokey-0.4.15-remove_spsdk.patch b/trunk/python-pynitrokey-0.4.15-remove_spsdk.patch
deleted file mode 100644
index b98fa9cc3672..000000000000
--- a/trunk/python-pynitrokey-0.4.15-remove_spsdk.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git i/pynitrokey/cli/__init__.py w/pynitrokey/cli/__init__.py
-index dc27289..034cd60 100644
---- i/pynitrokey/cli/__init__.py
-+++ w/pynitrokey/cli/__init__.py
-@@ -18,7 +18,6 @@ import pynitrokey
- import pynitrokey.fido2.operations
- from pynitrokey.cli.fido2 import fido2
- from pynitrokey.cli.nethsm import nethsm
--from pynitrokey.cli.nk3 import nk3
- from pynitrokey.cli.pro import pro
- from pynitrokey.cli.start import start
- from pynitrokey.cli.storage import storage
-@@ -58,7 +57,6 @@ def nitropy():
- 
- nitropy.add_command(fido2)
- nitropy.add_command(nethsm)
--nitropy.add_command(nk3)
- nitropy.add_command(start)
- nitropy.add_command(storage)
- nitropy.add_command(pro)
-@@ -76,7 +74,6 @@ nitropy.add_command(version)
- def _list():
-     fido2.commands["list"].callback()
-     start.commands["list"].callback()
--    nk3.commands["list"].callback()
- 
- 
- @click.command()
-diff --git i/pyproject.toml w/pyproject.toml
-index 36d76e4..87ae2e3 100644
---- i/pyproject.toml
-+++ w/pyproject.toml
-@@ -32,7 +32,6 @@ dependencies = [
-   "python-dateutil",
-   "pyusb",
-   "requests",
--  "spsdk >=1.6.0",
-   "tqdm",
-   "urllib3",
- ]