From bba1f3529500dfb3d55644ee78f4a95e5bab97bb Mon Sep 17 00:00:00 2001
From: Seth Jennings <sjenning@redhat.com>
Date: Wed, 2 May 2018 22:58:02 -0500
Subject: [PATCH] upstream release 4.3.3

---
 .gitignore            |  2 ++
 sources               |  5 ++---
 yubioath-desktop.spec | 22 +++++++---------------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb11900..de43a98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
 /yubioath-desktop-1d3fae1.tar.gz
 /yubikey-manager-fde87e3.tar.gz
 /yubioath-desktop-b9a7f28.tar.gz
+/yubikey-manager-8d7756f.tar.gz
+/yubioath-desktop-098b814.tar.gz
diff --git a/sources b/sources
index 1c16695..0b7ae55 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-SHA512 (pyotherside-fdb5950.tar.gz) = b60aecaa393a9918c59f80f489560b367464a4c2ae94c6cf3d839b6697fa52dde19022386cec3f9fe70df673a4cc43ee9bd9125fcd9b7c4073c8ecff49c327dd
 SHA512 (qt-solutions-5eac28c.tar.gz) = 63e44de8c056a21d94f07259351aadaad0a798a695726f89a35555c1657515c2128d0cedfd9c63a41ef80e9abf87224f6dcacc935335a39fb4326abc9c5b7330
-SHA512 (yubikey-manager-fde87e3.tar.gz) = 5e4cd0b7fda5695ee21dc5ebaa45b3054c963c18f47eb8ffc94d62a2548fb62a22ea3fd0b6d1e435d0351b41dd01d880642ac0cacea554bd6891d3358645a4a3
-SHA512 (yubioath-desktop-b9a7f28.tar.gz) = 30e2f061d9f853adfbac37146187ec72e92bf76b1ec8deecf5ef8dc67f6b7a33c60e97f1b8d5a6abaa4d04ae45a81818beaa40f88ec6f4f0a59c7946284ff4d3
+SHA512 (yubikey-manager-8d7756f.tar.gz) = 85f4c79afd88f8bc12dfd198bf2ef127d2c5f5bf5bf73cfa66befd09ced63094f1a8fbe453dc6c345c7f0f0be337d99df39fe63cf8fa8a18b76e011378267150
+SHA512 (yubioath-desktop-098b814.tar.gz) = 8e711ca679904a1dc95d50890bd0101786a8a47191c931a72e0c685140235a6f5abb8868b720ff6c1bc9a01121f466646775cd0f9823a718ef2f70c160647a2c
diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec
index 6360d33..f66c445 100644
--- a/yubioath-desktop.spec
+++ b/yubioath-desktop.spec
@@ -1,30 +1,25 @@
 %global debug_package %{nil}
 
 # yubioath-desktop
-%global commit0 b9a7f283ab9656c937c3b17a46088026ad067cb5
+%global commit0 098b81444c6f1d4cd1352d60ffe6902f6459da67
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
-# pyotherside
-%global commit1 fdb5950acd1fc14eb8926ab939594a95c9602a79
-%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
-
 # qt-solutions
 %global commit2 5eac28ccd8bfdcad0000d053519547c8ad8991fe
 %global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
 
 # yubikey-manager
-%global commit3 fde87e3467474749fe0e39832e155ddde574429d
+%global commit3 8d7756f7a3218615ec4254a9d7569959ca05df1d
 %global shortcommit3 %(c=%{commit3}; echo ${c:0:7})
 
 Name:		yubioath-desktop
-Version:	4.2.0
-Release:	4%{?dist}
+Version:	4.3.3
+Release:	1%{?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
-Source1:	https://github.com/thp/pyotherside/archive/%{commit1}.tar.gz#/pyotherside-%{shortcommit1}.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
 
@@ -40,19 +35,13 @@ password codes, with the help of a YubiKey that protects the shared secrets.
 
 %prep
 %autosetup -n %{name}-%{commit0}
-%setup -D -n %{name}-%{commit0} -a 1
 %setup -D -n %{name}-%{commit0} -a 2
 %setup -D -n %{name}-%{commit0} -a 3
 rmdir vendor/*
-mv -f pyotherside-%{commit1} vendor/pyotherside
 mv -f qt-solutions-%{commit2} vendor/qt-solutions
 mv -f yubikey-manager-%{commit3} vendor/yubikey-manager
 
 %build
-cd vendor/pyotherside
-qmake-qt5
-%make_build
-cd ../..
 qmake-qt5
 %make_build
 
@@ -74,6 +63,9 @@ cp %{_builddir}/%{buildsubdir}/resources/icons/yubioath.png %{buildroot}%{_datad
 %{_datadir}/applications/*
 
 %changelog
+* Wed May 2 2018 Seth Jennings <sethdjennings@gmail.com> - 4.3.3-1
+- Upstream release
+
 * Sun Mar 18 2018 Iryna Shcherbina <ishcherb@redhat.com> - 4.2.0-4
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)