From 5a4b3b39c2f035448474cf8899039a82d14ce48e Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Mon, 21 Aug 2017 21:54:21 -0500 Subject: [PATCH] upstream release 4.1.3 --- .gitignore | 8 +++++ gpgkey-6FBA95E8.gpg | Bin 6510 -> 0 bytes sources | 7 ++-- yubioath-desktop.spec | 80 +++++++++++++++++++++++++----------------- 4 files changed, 59 insertions(+), 36 deletions(-) delete mode 100644 gpgkey-6FBA95E8.gpg diff --git a/.gitignore b/.gitignore index e17f0a6..5585d8e 100644 --- a/.gitignore +++ b/.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 diff --git a/gpgkey-6FBA95E8.gpg b/gpgkey-6FBA95E8.gpg deleted file mode 100644 index ceb7403dbdc1b59a430c86f17ae4b5c49ba5c3d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6510 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 ZDQ#j>&xqvRzUK!WgO=$ld}h4a{}(y(7}Nj& diff --git a/sources b/sources index 9e8e976..6cf9474 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -1025b68e5a10c1238b356f68e735bf44 yubioath-desktop-3.0.1.tar.gz -4f89a5b0cb7a8ee5d49ea28a5b68916d yubioath-desktop-3.0.1.tar.gz.sig -3d7e6090eae89e1bbd3f9bf2ab4aa785 0001-Update-desktop-icon-command.patch +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 diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec index b3b2110..55027d0 100644 --- a/yubioath-desktop.spec +++ b/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 -Release: 4%{?dist} +Version: 4.1.3 +Release: 1%{?dist} Summary: Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes -BuildArch: noarch -License: GPLv3+ -URL: https://developers.yubico.com/%{name}/ -Source0: https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.gz -Source1: https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.gz.sig -Source2: gpgkey-6FBA95E8.gpg +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 -Patch0: 0001-Update-desktop-icon-command.patch - -BuildRequires: gnupg2 python2-devel desktop-file-utils -Requires: python2-crypto pyscard python-pyside ykpers pcsc-lite-ccid pyusb python-click +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 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 -# https://bugzilla.redhat.com/show_bug.cgi?id=1292687 -# Disabling signature check until resolved -#gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} -%autosetup -p1 +%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 -%{__python2} setup.py build +cd vendor/pyotherside +qmake-qt5 +%make_build +cd ../.. +qmake-qt5 +%make_build %install -%{__python2} setup.py 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 +%make_install INSTALL_ROOT=%{buildroot} # 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 -%{python2_sitelib}/yubioath/ -%{python2_sitelib}/yubioath_desktop* +%doc NEWS README %{_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 - 4.1.3-1 +- Upstream release. + * Thu Jul 27 2017 Fedora Release Engineering - 3.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild