From bf6c29245976e8af8c0d3f4ab1d2d4594b30476a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 3 Jan 2019 11:12:25 +0100 Subject: [PATCH] Trivial fixes Signed-off-by: Igor Gnatenko --- yubioath-desktop.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec index cf55817..ec8e155 100644 --- a/yubioath-desktop.spec +++ b/yubioath-desktop.spec @@ -6,18 +6,15 @@ Name: yubioath-desktop Version: 4.3.5 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes License: BSD URL: https://github.com/%{owner}/yubioath-desktop Source: https://github.com/%{owner}/%{name}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz -BuildRequires: qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtsvg-devel gcc-c++ python2 python-unversioned-command desktop-file-utils -BuildRequires: python3-fido2 +BuildRequires: qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtsvg-devel gcc-c++ python3 desktop-file-utils Requires: pyotherside qt5-qtdeclarative qt5-qtquickcontrols pcsc-lite-ccid yubikey-manager -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils %description The Yubico Authenticator is a graphical desktop tool and CLI for generating @@ -26,20 +23,21 @@ password codes, with the help of a YubiKey that protects the shared secrets. %prep %autosetup -n %{name}-%{commit} +sed -i -e "s/python /python3 /" %{name}.pro +sed -i -e "1s|^#.*$|#!%{__python3}|g" build_qrc.py py/yubikey.py %build -qmake-qt5 +%qmake_qt5 %make_build %install %make_install INSTALL_ROOT=%{buildroot} # desktop file -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{_builddir}/%{buildsubdir}/resources/yubioath-desktop.desktop +desktop-file-install --dir=%{buildroot}%{_datadir}/applications resources/yubioath-desktop.desktop # icons -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps -cp %{_builddir}/%{buildsubdir}/resources/icons/yubioath.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps +install -Dpm0644 -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps resources/icons/yubioath.png %files %license COPYING @@ -49,7 +47,10 @@ cp %{_builddir}/%{buildsubdir}/resources/icons/yubioath.png %{buildroot}%{_datad %{_datadir}/applications/* %changelog -* Mon Dec 31 2018 Gerald Cox - 4.3.5-1.git{%shortcommit} +* Thu Jan 03 2019 Igor Gnatenko - 4.3.5-2.git0a8c363 +- Trivial fixes + +* Mon Dec 31 2018 Gerald Cox - 4.3.5-1.git0a8c363 - Upstream release rhbz#1655888 * Tue Aug 14 2018 Seth Jennings - 4.3.3-4