From 784b130dc0af005ed3e723f07b26cad0015a89c1 Mon Sep 17 00:00:00 2001
From: Gerald B Cox <gbcox@bzb.us>
Date: Mon, 31 Dec 2018 11:11:04 -0800
Subject: [PATCH] Upstream release rhbz#1655888

---
 .gitignore            |  1 +
 sources               |  4 +---
 yubioath-desktop.spec | 35 ++++++++++++-----------------------
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index de43a98..04899bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /yubioath-desktop-b9a7f28.tar.gz
 /yubikey-manager-8d7756f.tar.gz
 /yubioath-desktop-098b814.tar.gz
+/yubioath-desktop-0a8c363.tar.gz
diff --git a/sources b/sources
index 0b7ae55..047c1e1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (qt-solutions-5eac28c.tar.gz) = 63e44de8c056a21d94f07259351aadaad0a798a695726f89a35555c1657515c2128d0cedfd9c63a41ef80e9abf87224f6dcacc935335a39fb4326abc9c5b7330
-SHA512 (yubikey-manager-8d7756f.tar.gz) = 85f4c79afd88f8bc12dfd198bf2ef127d2c5f5bf5bf73cfa66befd09ced63094f1a8fbe453dc6c345c7f0f0be337d99df39fe63cf8fa8a18b76e011378267150
-SHA512 (yubioath-desktop-098b814.tar.gz) = 8e711ca679904a1dc95d50890bd0101786a8a47191c931a72e0c685140235a6f5abb8868b720ff6c1bc9a01121f466646775cd0f9823a718ef2f70c160647a2c
+SHA512 (yubioath-desktop-0a8c363.tar.gz) = e630cab0d60d2c788ccf4142081ab827d01f2e8ff29d641f41248e9d8275e833c262b0cf234da4c0364f6f04be52e8bdc68c216264292079ae908792af8dc878
diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec
index b5f1501..cf55817 100644
--- a/yubioath-desktop.spec
+++ b/yubioath-desktop.spec
@@ -1,29 +1,20 @@
 %global debug_package %{nil}
 
-# yubioath-desktop
-%global commit0 098b81444c6f1d4cd1352d60ffe6902f6459da67
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
-# qt-solutions
-%global commit2 5eac28ccd8bfdcad0000d053519547c8ad8991fe
-%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
-
-# yubikey-manager
-%global commit3 8d7756f7a3218615ec4254a9d7569959ca05df1d
-%global shortcommit3 %(c=%{commit3}; echo ${c:0:7})
+%global commit 0a8c3638aef4507f14ac629b3a670dc5f195fa04
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global owner Yubico
 
 Name:		yubioath-desktop
-Version:	4.3.3
-Release:	4%{?dist}
+Version:	4.3.5
+Release:	1.git%{shortcommit}%{?dist}
 Summary:	Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes
 
 License:	BSD
-URL:		https://github.com/Yubico/yubioath-desktop
-Source0:	https://github.com/Yubico/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
-Source2:	https://github.com/qtproject/qt-solutions/archive/%{commit2}.tar.gz#/qt-solutions-%{shortcommit2}.tar.gz
-Source3:	https://github.com/Yubico/yubikey-manager/archive/%{commit3}.tar.gz#/yubikey-manager-%{shortcommit3}.tar.gz
+URL:		https://github.com/%{owner}/yubioath-desktop
+Source:	https://github.com/%{owner}/%{name}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz
 
 BuildRequires:		qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtsvg-devel gcc-c++ python2 python-unversioned-command desktop-file-utils
+BuildRequires:		python3-fido2
 Requires:		pyotherside qt5-qtdeclarative qt5-qtquickcontrols pcsc-lite-ccid yubikey-manager
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
@@ -34,12 +25,7 @@ Open AuTHentication (OATH) event-based HOTP and time-based TOTP one-time
 password codes, with the help of a YubiKey that protects the shared secrets.
 
 %prep
-%autosetup -n %{name}-%{commit0}
-%setup -D -n %{name}-%{commit0} -a 2
-%setup -D -n %{name}-%{commit0} -a 3
-rmdir vendor/*
-mv -f qt-solutions-%{commit2} vendor/qt-solutions
-mv -f yubikey-manager-%{commit3} vendor/yubikey-manager
+%autosetup -n %{name}-%{commit}
 
 %build
 qmake-qt5
@@ -63,6 +49,9 @@ cp %{_builddir}/%{buildsubdir}/resources/icons/yubioath.png %{buildroot}%{_datad
 %{_datadir}/applications/*
 
 %changelog
+* Mon Dec 31 2018 Gerald Cox <gbcox@fedoraproject.org> - 4.3.5-1.git{%shortcommit}
+- Upstream release rhbz#1655888
+
 * Tue Aug 14 2018 Seth Jennings <sethdjennings@gmail.com> - 4.3.3-4
 - add python-unversioned-command to BuildRequires