- updated to 4.3.4

diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec
index 411e097267d243a349a7c9e72f8dccffd5dcc88c..6f8712e5a9fe382227ad929c757dfca40e3f7ecb 100644 (file)
--- a/yubioath-desktop.spec
+++ b/yubioath-desktop.spec
@@ -1,22 +1,28 @@
 Summary:       Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes
+Summary(pl.UTF-8):     Narzędzie Yubikey do generowania kodów OATH opartych na zdarzeniach (HOTP) i czasie (TOTP)
 Name:          yubioath-desktop
-Version:       3.1.0
+Version:       4.3.4
 Release:       1
-License:       GPL v3+
+License:       BSD
 Group:         X11/Applications
-URL:           https://developers.yubico.com/yubioath-desktop/
 Source0:       https://developers.yubico.com/yubioath-desktop/Releases/%{name}-%{version}.tar.gz
-# Source0-md5: 2b36482fc4ecd5edf8cc4d72716bdef4
-BuildRequires: asciidoc
+# Source0-md5: a4a18ba12d8ce63e94f0c0af80194a8a
+URL:           https://developers.yubico.com/yubioath-desktop/
+BuildRequires: Qt5Gui-devel >= 5
+BuildRequires: Qt5Qml-devel >= 5
+BuildRequires: Qt5Quick-devel >= 5
+BuildRequires: Qt5Widgets-devel >= 5
 BuildRequires: desktop-file-utils
-BuildRequires: python-devel
+BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: python3 >= 1:3.2
+BuildRequires: python3-modules >= 1:3.2
+BuildRequires: qt5-build >= 5
+BuildRequires: qt5-qmake >= 5
+Requires(post,postun): desktop-file-utils
 Requires:      pcsc-driver-ccid
 Requires:      python-PySide
-Requires:      pythonegg(click)
-Requires:      ykpers
-Requires(post):        desktop-file-utils
-Requires(postun):      desktop-file-utils
-BuildArch:     noarch
+Requires:      yubikey-manager
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The Yubico Authenticator is a graphical desktop tool and CLI for
@@ -24,55 +30,54 @@ generating 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.
 
+%description -l pl.UTF-8
+Yubico Authenticator to narzędzie graficzne oraz linii poleceń do
+generowania kodów jednorazowych haseł OATH (Open AuTHentication)
+opartych na zdarzeniach (HOTP) i czasie (TOTP) z pomocą urządzenia
+YubiKey, które zabezpiecza współdzielone dane prywatne.
+
 %prep
+%if 0
 %setup -q
+%else
+# 4.3.4 tarball is broken (pure tar saved as .tar.gz)
+%setup -q -c -T -n %{name}
+%{__tar} xf %{SOURCE0} -C ..
+%endif
 
 %build
-%{py_build}
+qmake-qt5 \
+       QMAKE_CXX="%{__cxx}" \
+       QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
+       QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
 
-for m in man/*.adoc; do
-       a2x -f manpage "$m"
-done
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{py_install}
 
-# man pages
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%{__make} install \
+       INSTALL_ROOT=$RPM_BUILD_ROOT \
+       STRIP=:
 
 # desktop file
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_desktopdir} %{_builddir}/%{buildsubdir}/resources/yubioath.desktop
-
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_desktopdir} resources/yubioath-desktop.desktop
 # icons
 install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-cp %{_builddir}/%{buildsubdir}/resources/yubioath.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
-install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
-cp %{_builddir}/%{buildsubdir}/resources/yubioath-desktop.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+cp -p resources/icons/yubioath.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%update_icon_cache hicolor
 %update_desktop_database
 
 %postun
-if [ $1 -eq 0 ] ; then
-       %update_icon_cache hicolor
-fi
 %update_desktop_database
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/yubioath
-%attr(755,root,root) %{_bindir}/yubioath-gui
-%{py_sitescriptdir}/yubioath
-%{py_sitescriptdir}/yubioath_desktop*.egg-info
-%{_desktopdir}/yubioath.desktop
-%{_iconsdir}/hicolor/128x128/apps/yubioath-desktop.png
-%{_pixmapsdir}/yubioath.xpm
-%{_mandir}/man1/yubioath-gui.1*
-%{_mandir}/man1/yubioath.1*
+%doc COPYING NEWS README
+%attr(755,root,root) %{_bindir}/yubioath-desktop
+%{_desktopdir}/yubioath-desktop.desktop
+%{_pixmapsdir}/yubioath.png