From 3fe6a2721af10814a8212a7876593fdbc11cee9a Mon Sep 17 00:00:00 2001
From: Seth Jennings <spartacus06@gmail.com>
Date: Fri, 28 Aug 2015 11:33:28 -0500
Subject: [PATCH] Upstream release 2.2.1

---
 .gitignore                        |   4 +++-
 fix-pyside-requirement.patch      |  12 ++++++++++++
 sources                           |   3 ++-
 yubioath-desktop-2.1.1.tar.gz.sig | Bin 287 -> 0 bytes
 yubioath-desktop.spec             |  14 ++++++++++----
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 fix-pyside-requirement.patch
 delete mode 100644 yubioath-desktop-2.1.1.tar.gz.sig

diff --git a/.gitignore b/.gitignore
index 57a2a65..2c07862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-/yubioath-desktop-2.1.1.tar.gz
+/gpgkey-6FBA95E8.gpg
+/yubioath-desktop-2.2.1.tar.gz
+/yubioath-desktop-2.2.1.tar.gz.sig
diff --git a/fix-pyside-requirement.patch b/fix-pyside-requirement.patch
new file mode 100644
index 0000000..6f4544e
--- /dev/null
+++ b/fix-pyside-requirement.patch
@@ -0,0 +1,12 @@
+--- 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 9a5abfb..1f76baf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-49e0ba9c7d7510153d3b5b06cf39d1c5  yubioath-desktop-2.1.1.tar.gz
+a0bc29dd4f0b0611032f8be09a693f24  yubioath-desktop-2.2.1.tar.gz
+81d4b66b8b3a71ff75553e3b8a80ec10  yubioath-desktop-2.2.1.tar.gz.sig
diff --git a/yubioath-desktop-2.1.1.tar.gz.sig b/yubioath-desktop-2.1.1.tar.gz.sig
deleted file mode 100644
index 9b00018a88dd5f7eaf2bef2566c61771e0574975..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmV+)0pR|L0UQJX0SEvF1p-x-GS2`C2@vo@X9;h*mFRje2mp}7h&(D5B$aLZb&SYA
z6~x4ry9^wnn@_`&Y8B&L4e`W{%>ujhabn3^!$h8n6UgOgG7cXzGE@OKAHX&GAl5GE
z1C4roT=SW^<jx*J@n;c)j)gt#@^1NW*Xu4ph>54~#vprA0nVW7PMRvL`t8z>xH=J|
z>;?>mVFfl@JEc7zRD@lNtlOFEBYU5(BK+N<49V{nHh?bmtfp-pyYp&#X%d~rkUW^W
z94&CIz{xhB9G3<XCc(iv4OTH~FfrY!O2F{;!gYQn=w_ZFY3AAHevsx8DX6`SpuO?o
ld~#)+Ub>@GbE{u(91=E?)6@uefT7g*&l#uW2GqeRcdLCbh&uoP

diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec
index ddcc196..957eb9b 100644
--- a/yubioath-desktop.spec
+++ b/yubioath-desktop.spec
@@ -1,8 +1,8 @@
 %global debug_package %{nil}
 
 Name:		yubioath-desktop
-Version:	2.1.1
-Release:	3%{?dist}
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes
 BuildArch:	noarch
 
@@ -12,6 +12,8 @@ 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
+
 BuildRequires:		gnupg2 python2-devel desktop-file-utils
 Requires:		python-crypto pyscard python-pyside ykpers pcsc-lite-ccid
 Requires(post):		desktop-file-utils
@@ -25,6 +27,7 @@ password codes, with the help of a YubiKey that protects the shared secrets.
 %prep
 gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %setup -q
+%patch0 -p1
 
 %build
 %{__python2} setup.py build
@@ -50,8 +53,8 @@ cp %{_builddir}/%{buildsubdir}/resources/yubioath-desktop.png %{buildroot}%{_dat
 %files
 %license COPYING
 %doc ChangeLog NEWS README
-%{python_sitelib}/yubioath/
-%{python_sitelib}/yubioath_desktop*
+%{python2_sitelib}/yubioath/
+%{python2_sitelib}/yubioath_desktop*
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/icons/hicolor/128x128/apps/*
@@ -73,6 +76,9 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* Thu Aug 27 2015 Seth Jennings <spartacus06@gmail.com> - 2.2.1-1
+- Upstream release.
+
 * Thu Aug 06 2015 Seth Jennings <spartacus06@gmail.com> - 2.1.1-3
 - Use __python2 macro.