upstream release 4.1.3

.gitignore

@@ -6,3 +6,11 @@
 /yubioath-desktop-3.0.1.tar.gz
 /yubioath-desktop-3.0.1.tar.gz.sig
 /0001-Update-desktop-icon-command.patch
+/yubioath-desktop-4.0.1.tar.gz
+/yubioath-desktop-4.0.1.tar.gz.sig
+/pyotherside-fdb5950.tar.gz
+/qt-solutions-5eac28c.tar.gz
+/yubikey-manager-8c9fb68.tar.gz
+/yubioath-desktop-37a1873.tar.gz
+/yubikey-manager-ec4a88a.tar.gz
+/yubioath-desktop-1d3fae1.tar.gz

sources

@@ -1,3 +1,4 @@
-1025b68e5a10c1238b356f68e735bf44  yubioath-desktop-3.0.1.tar.gz
+SHA512 (pyotherside-fdb5950.tar.gz) = b60aecaa393a9918c59f80f489560b367464a4c2ae94c6cf3d839b6697fa52dde19022386cec3f9fe70df673a4cc43ee9bd9125fcd9b7c4073c8ecff49c327dd
-4f89a5b0cb7a8ee5d49ea28a5b68916d  yubioath-desktop-3.0.1.tar.gz.sig
+SHA512 (qt-solutions-5eac28c.tar.gz) = 63e44de8c056a21d94f07259351aadaad0a798a695726f89a35555c1657515c2128d0cedfd9c63a41ef80e9abf87224f6dcacc935335a39fb4326abc9c5b7330
-3d7e6090eae89e1bbd3f9bf2ab4aa785  0001-Update-desktop-icon-command.patch
+SHA512 (yubikey-manager-ec4a88a.tar.gz) = df9ce0f6a3c0de926300e1b2e9ee8a01bb5c9e481b8a55a6a655aa5573a5b7e8be53289af1caf21deaccdfb8ba1e1cc39f7b1e8445c40ead0a3dc15f7af0a0b3
+SHA512 (yubioath-desktop-1d3fae1.tar.gz) = 1d90d13ae5e106f56e064e3d50ed702ad710fff7a3975e9c1cbd1814289c25d04bfab9ec7acef2d8d03356479b89c6c31d1c3344861b03bb09ace376c4418f5b

yubioath-desktop.spec

@@ -1,21 +1,36 @@
 %global debug_package %{nil}
 
+# yubioath-desktop
+%global commit0 1d3fae1d86f4e9990e9f0b7cbff89a54aac63134
+%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 gittag2 notags
+%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
+
+# yubikey-manager
+%global commit3 ec4a88a9dcd6d9c748637daec96cd5032cd7a601
+%global shortcommit3 %(c=%{commit3}; echo ${c:0:7})
+
 Name:		yubioath-desktop
-Version:	3.0.1
+Version:	4.1.3
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes
-BuildArch:	noarch
 
-License:	GPLv3+
+License:	BSD
-URL:		https://developers.yubico.com/%{name}/
+URL:		https://github.com/Yubico/yubioath-desktop
-Source0:	https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.gz
+Source0:	https://github.com/Yubico/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
-Source1:	https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.gz.sig
+Source1:	https://github.com/thp/pyotherside/archive/%{commit1}.tar.gz#/pyotherside-%{shortcommit1}.tar.gz
-Source2:	gpgkey-6FBA95E8.gpg
+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
 
-Patch0:		0001-Update-desktop-icon-command.patch
+BuildRequires:		qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtsvg-devel gcc-c++ python3-devel python desktop-file-utils
-
+Requires:		pyotherside qt5-qtdeclarative qt5-qtquickcontrols pcsc-lite-ccid yubikey-manager
-BuildRequires:		gnupg2 python2-devel desktop-file-utils
-Requires:		python2-crypto pyscard python-pyside ykpers pcsc-lite-ccid pyusb python-click
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
@@ -25,42 +40,38 @@ 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
-# Signature verification doesn't work in rawhide/F24 due to
+%autosetup -n %{name}-%{commit0}
-# https://bugzilla.redhat.com/show_bug.cgi?id=1292687
+%setup -D -n %{name}-%{commit0} -a 1
-# Disabling signature check until resolved
+%setup -D -n %{name}-%{commit0} -a 2
-#gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%setup -D -n %{name}-%{commit0} -a 3
-%autosetup -p1
+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
-%{__python2} setup.py build
+cd vendor/pyotherside
+qmake-qt5
+%make_build
+cd ../..
+qmake-qt5
+%make_build
 
 %install
-%{__python2} setup.py install --root=%{buildroot}
+%make_install INSTALL_ROOT=%{buildroot}
-
-# man pages
-mkdir -p %{buildroot}%{_mandir}/man1
-cp %{_builddir}/%{buildsubdir}/man/*.1 %{buildroot}%{_mandir}/man1
-gzip %{buildroot}%{_mandir}/man1/yubioath.1
-gzip %{buildroot}%{_mandir}/man1/yubioath-gui.1
 
 # desktop file
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{_builddir}/%{buildsubdir}/resources/yubioath.desktop
 
 # icons
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-cp %{_builddir}/%{buildsubdir}/resources/yubioath.xpm %{buildroot}%{_datadir}/pixmaps
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
-cp %{_builddir}/%{buildsubdir}/resources/yubioath-desktop.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
+cp %{_builddir}/%{buildsubdir}/resources/icons/yubioath.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
 
 %files
 %license COPYING
-%doc ChangeLog NEWS README
+%doc NEWS README
-%{python2_sitelib}/yubioath/
-%{python2_sitelib}/yubioath_desktop*
 %{_bindir}/*
-%{_mandir}/man1/*
 %{_datadir}/icons/hicolor/128x128/apps/*
-%{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 
 %post
@@ -78,6 +89,9 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* Thu Mar 30 2017 Seth Jennings <sethdjennings@gmail.com> - 4.1.3-1
+- Upstream release.
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild