From a6cfb84f350e5c57a363828ccace6362ccccd6a1 Mon Sep 17 00:00:00 2001
From: Seth Jennings <sjenning@redhat.com>
Date: Fri, 15 Dec 2017 16:26:58 -0600
Subject: [PATCH] upstream release 4.2.0

---
 .gitignore            |  2 ++
 sources               |  4 ++--
 yubioath-desktop.spec | 12 +++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5585d8e..cb11900 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /yubioath-desktop-37a1873.tar.gz
 /yubikey-manager-ec4a88a.tar.gz
 /yubioath-desktop-1d3fae1.tar.gz
+/yubikey-manager-fde87e3.tar.gz
+/yubioath-desktop-b9a7f28.tar.gz
diff --git a/sources b/sources
index 6cf9474..1c16695 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (pyotherside-fdb5950.tar.gz) = b60aecaa393a9918c59f80f489560b367464a4c2ae94c6cf3d839b6697fa52dde19022386cec3f9fe70df673a4cc43ee9bd9125fcd9b7c4073c8ecff49c327dd
 SHA512 (qt-solutions-5eac28c.tar.gz) = 63e44de8c056a21d94f07259351aadaad0a798a695726f89a35555c1657515c2128d0cedfd9c63a41ef80e9abf87224f6dcacc935335a39fb4326abc9c5b7330
-SHA512 (yubikey-manager-ec4a88a.tar.gz) = df9ce0f6a3c0de926300e1b2e9ee8a01bb5c9e481b8a55a6a655aa5573a5b7e8be53289af1caf21deaccdfb8ba1e1cc39f7b1e8445c40ead0a3dc15f7af0a0b3
-SHA512 (yubioath-desktop-1d3fae1.tar.gz) = 1d90d13ae5e106f56e064e3d50ed702ad710fff7a3975e9c1cbd1814289c25d04bfab9ec7acef2d8d03356479b89c6c31d1c3344861b03bb09ace376c4418f5b
+SHA512 (yubikey-manager-fde87e3.tar.gz) = 5e4cd0b7fda5695ee21dc5ebaa45b3054c963c18f47eb8ffc94d62a2548fb62a22ea3fd0b6d1e435d0351b41dd01d880642ac0cacea554bd6891d3358645a4a3
+SHA512 (yubioath-desktop-b9a7f28.tar.gz) = 30e2f061d9f853adfbac37146187ec72e92bf76b1ec8deecf5ef8dc67f6b7a33c60e97f1b8d5a6abaa4d04ae45a81818beaa40f88ec6f4f0a59c7946284ff4d3
diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec
index 7d42d38..ae655ea 100644
--- a/yubioath-desktop.spec
+++ b/yubioath-desktop.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 # yubioath-desktop
-%global commit0 1d3fae1d86f4e9990e9f0b7cbff89a54aac63134
+%global commit0 b9a7f283ab9656c937c3b17a46088026ad067cb5
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # pyotherside
@@ -10,15 +10,14 @@
 
 # qt-solutions
 %global commit2 5eac28ccd8bfdcad0000d053519547c8ad8991fe
-#%global gittag2 notags
 %global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
 
 # yubikey-manager
-%global commit3 ec4a88a9dcd6d9c748637daec96cd5032cd7a601
+%global commit3 fde87e3467474749fe0e39832e155ddde574429d
 %global shortcommit3 %(c=%{commit3}; echo ${c:0:7})
 
 Name:		yubioath-desktop
-Version:	4.1.3
+Version:	4.2.0
 Release:	1%{?dist}
 Summary:	Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes
 
@@ -61,7 +60,7 @@ qmake-qt5
 %make_install INSTALL_ROOT=%{buildroot}
 
 # desktop file
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{_builddir}/%{buildsubdir}/resources/yubioath.desktop
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{_builddir}/%{buildsubdir}/resources/yubioath-desktop.desktop
 
 # icons
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
@@ -89,6 +88,9 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* Fri Dec 15 2017 Seth Jennings <sethdjennings@gmail.com> - 4.2.0-1
+- Upstream release.
+
 * Mon Aug 21 2017 Seth Jennings <sethdjennings@gmail.com> - 4.1.3-1
 - Upstream release.