From 7ab6cdeb00f27d996e675ec38683e73e2ba9a265 Mon Sep 17 00:00:00 2001 From: gbcox Date: Wed, 16 Oct 2019 07:24:15 -0700 Subject: [PATCH 1/2] Upstream release - rhbz#1762309 --- .gitignore | 1 + sources | 2 +- yubioath-desktop.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4d89dc1..d58f972 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /yubioath-desktop-0a8c363.tar.gz /yubioath-desktop-d1187b6.tar.gz /yubioath-desktop-121efe3.tar.gz +/yubioath-desktop-c58db92.tar.gz diff --git a/sources b/sources index 9bc6b85..f4ccf08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yubioath-desktop-121efe3.tar.gz) = 9dc24f51d968502193696aa9781f1e8efb9f65214fcd270d1b55d691585820e0288c94135d71a904a37f073eaf219f2356d612b1c1c7720b306d1b40b18dd5ab +SHA512 (yubioath-desktop-c58db92.tar.gz) = 13cb4763072d32fff527029c8d161882a9719441462dcf1816932674d0ccc07a1697a68f0837c33757f1ae93c0adc7b49e74af0ee29d6417886b8ba3d92c47df diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec index 3f3e31a..a5b28c7 100644 --- a/yubioath-desktop.spec +++ b/yubioath-desktop.spec @@ -1,12 +1,10 @@ -%global debug_package %{nil} - -%global commit 121efe3b65c77de34352a9e4b9c4314c38b5107a +%global commit c58db92b64f9676b71c6fd7f6c9f4f0c59a8541e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global owner Yubico Name: yubioath-desktop -Version: 5.0.0 -Release: 2.git%{shortcommit}%{?dist} +Version: 5.0.1 +Release: 1.git%{shortcommit}%{?dist} Summary: Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes License: BSD @@ -52,6 +50,9 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps resources %{_datadir}/applications/* %changelog +* Wed Oct 16 2019 Gerald Cox - 5.0.1-1.gitc58db92 +- Upstream release - rhbz#1762309 + * Wed Sep 25 2019 Jan Grulich - 5.0.0-2.git121efe3 - rebuild (qt5) From 7b9a149e6e5e8874c611e23dfe4195fa3f108d71 Mon Sep 17 00:00:00 2001 From: gbcox Date: Mon, 21 Oct 2019 11:26:34 -0700 Subject: [PATCH 2/2] Add rpmlintrc - rhbz#1762309 --- yubioath-desktop.rpmlintrc | 3 +++ yubioath-desktop.spec | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 yubioath-desktop.rpmlintrc diff --git a/yubioath-desktop.rpmlintrc b/yubioath-desktop.rpmlintrc new file mode 100644 index 0000000..ea84abe --- /dev/null +++ b/yubioath-desktop.rpmlintrc @@ -0,0 +1,3 @@ +# SPELLING ERRORS +addFilter(r" spelling-error .* (Yubikey)") +addFilter(r" no-manual-page-for-binary yubioath-desktop") diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec index a5b28c7..e79170d 100644 --- a/yubioath-desktop.spec +++ b/yubioath-desktop.spec @@ -1,22 +1,24 @@ %global commit c58db92b64f9676b71c6fd7f6c9f4f0c59a8541e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global owner Yubico +%global svn git Name: yubioath-desktop Version: 5.0.1 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.%{svn}%{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 +Source0: https://github.com/%{owner}/%{name}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Source1: %{name}.rpmlintrc BuildRequires: qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtsvg-devel gcc-c++ BuildRequires: python3 desktop-file-utils qt5-qtquickcontrols2-devel Requires: pyotherside qt5-qtdeclarative qt5-qtquickcontrols pcsc-lite-ccid yubikey-manager ## uses Qt5 private api's these help track that -BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %description @@ -50,6 +52,9 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps resources %{_datadir}/applications/* %changelog +* Mon Oct 21 2019 Gerald Cox - 5.0.1-2.gitc58db92 +- Add rpmlintrc - rhbz#1762309 + * Wed Oct 16 2019 Gerald Cox - 5.0.1-1.gitc58db92 - Upstream release - rhbz#1762309