From 70d89912ee839bcc7589e879b7a0f839656d2263 Mon Sep 17 00:00:00 2001
From: Seth Jennings <sjenning@redhat.com>
Date: Mon, 25 Jul 2016 21:38:10 -0500
Subject: [PATCH] Upstream release 3.0.1

---
 .gitignore                   |  2 ++
 fix-pyside-requirement.patch | 12 ------------
 sources                      |  4 ++--
 yubioath-desktop.spec        | 14 ++++++++------
 4 files changed, 12 insertions(+), 20 deletions(-)
 delete mode 100644 fix-pyside-requirement.patch

diff --git a/.gitignore b/.gitignore
index 05eadbd..39a6184 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /yubioath-desktop-2.2.1.tar.gz.sig
 /yubioath-desktop-2.3.0.tar.gz
 /yubioath-desktop-2.3.0.tar.gz.sig
+/yubioath-desktop-3.0.1.tar.gz
+/yubioath-desktop-3.0.1.tar.gz.sig
diff --git a/fix-pyside-requirement.patch b/fix-pyside-requirement.patch
deleted file mode 100644
index 6f4544e..0000000
--- a/fix-pyside-requirement.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -44,7 +44,8 @@
-         'console_scripts': ['yubioath-cli=yubioath.cli.__main__:main']
-     },
-     setup_requires=[],
--    yc_requires=['ctypes', 'qt'],
-+    yc_requires=['ctypes'],
-+    packages=['yubioath', 'yubioath.gui', 'yubioath.yubicommon', 'yubioath.cli', 'yubioath.core', 'yubioath.gui.view', 'yubioath.yubicommon.setup', 'yubioath.yubicommon.ctypes', 'yubioath.yubicommon.qt'],
-     install_requires=['pyscard', 'pycrypto'],
-     extras_require={
-         'argcomplete': ['argcomplete']
diff --git a/sources b/sources
index c6d8479..d2f92bd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-844a3f36346892fafaa50eb97f28919d  yubioath-desktop-2.3.0.tar.gz
-2bfcb9e640a0efaeaad1232378435d8f  yubioath-desktop-2.3.0.tar.gz.sig
+1025b68e5a10c1238b356f68e735bf44  yubioath-desktop-3.0.1.tar.gz
+4f89a5b0cb7a8ee5d49ea28a5b68916d  yubioath-desktop-3.0.1.tar.gz.sig
diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec
index 6b99a12..d519555 100644
--- a/yubioath-desktop.spec
+++ b/yubioath-desktop.spec
@@ -1,8 +1,8 @@
 %global debug_package %{nil}
 
 Name:		yubioath-desktop
-Version:	2.3.0
-Release:	4%{?dist}
+Version:	3.0.1
+Release:	1%{?dist}
 Summary:	Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes
 BuildArch:	noarch
 
@@ -12,10 +12,10 @@ Source0:	https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.g
 Source1:	https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.gz.sig
 Source2:	gpgkey-6FBA95E8.gpg
 
-Patch0:		fix-pyside-requirement.patch
+#Patch0:		fix-pyside-requirement.patch
 
 BuildRequires:		gnupg2 python2-devel desktop-file-utils
-Requires:		python-crypto pyscard python-pyside ykpers pcsc-lite-ccid pyusb
+Requires:		python2-crypto pyscard python-pyside ykpers pcsc-lite-ccid pyusb python-click
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
@@ -30,7 +30,6 @@ password codes, with the help of a YubiKey that protects the shared secrets.
 # Disabling signature check until resolved
 #gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %setup -q
-%patch0 -p1
 
 %build
 %{__python2} setup.py build
@@ -42,7 +41,7 @@ password codes, with the help of a YubiKey that protects the shared secrets.
 mkdir -p %{buildroot}%{_mandir}/man1
 cp %{_builddir}/%{buildsubdir}/man/*.1 %{buildroot}%{_mandir}/man1
 gzip %{buildroot}%{_mandir}/man1/yubioath.1
-gzip %{buildroot}%{_mandir}/man1/yubioath-cli.1
+gzip %{buildroot}%{_mandir}/man1/yubioath-gui.1
 
 # desktop file
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{_builddir}/%{buildsubdir}/resources/yubioath.desktop
@@ -79,6 +78,9 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* Mon Jul 25 2016 Seth Jennings <spartacus06@gmail.com> - 3.0.1-1
+- Upstream release.
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages