From ea33b45b227de8d19b293ae6cecf1897291543535f19e301c6c18e8d13674288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 1 Apr 2016 09:45:49 +0000 Subject: [PATCH] Accepting request 382842 from home:pluskalm:branches:network - Update to 4.5.3 - Build with optflags - Use macros for desktop file and icon handling OBS-URL: https://build.opensuse.org/request/show/382842 OBS-URL: https://build.opensuse.org/package/show/network/datovka?expand=0&rev=11 --- datovka-4.5.0-src.tar.xz | 3 --- datovka-4.5.3-src.tar.xz | 3 +++ datovka-fix-pro.patch | 6 +++--- datovka.changes | 39 +++++++++++++++++++++++++++++++++++++++ datovka.spec | 22 ++++++++++++++++++---- 5 files changed, 63 insertions(+), 10 deletions(-) delete mode 100644 datovka-4.5.0-src.tar.xz create mode 100644 datovka-4.5.3-src.tar.xz diff --git a/datovka-4.5.0-src.tar.xz b/datovka-4.5.0-src.tar.xz deleted file mode 100644 index e561f5a..0000000 --- a/datovka-4.5.0-src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7aa5c4ff3f5cebe70166406fa9ae6d87b25f8b29a4f2618625ecd0901d5372d6 -size 2270680 diff --git a/datovka-4.5.3-src.tar.xz b/datovka-4.5.3-src.tar.xz new file mode 100644 index 0000000..cd3312d --- /dev/null +++ b/datovka-4.5.3-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a11575fdf28202cdf2fc7a043619c952e1d610babbc9807387ebea17b3970b6 +size 2253312 diff --git a/datovka-fix-pro.patch b/datovka-fix-pro.patch index 39c61a1..5683d04 100644 --- a/datovka-fix-pro.patch +++ b/datovka-fix-pro.patch @@ -1,7 +1,7 @@ -Index: datovka-4.5.0/datovka.pro +Index: datovka.pro =================================================================== ---- datovka-4.5.0.orig/datovka.pro -+++ datovka-4.5.0/datovka.pro +--- datovka.pro.orig ++++ datovka.pro @@ -61,7 +61,6 @@ isEqual(QT_MAJOR_VERSION, $${REQUIRED_MA #LIBISDS_PREFIX = "$$HOME/third_party/built" diff --git a/datovka.changes b/datovka.changes index 5fdb0f5..2e69679 100644 --- a/datovka.changes +++ b/datovka.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Fri Apr 1 09:20:07 UTC 2016 - mpluskal@suse.com + +- Update to 4.5.3 + * Fixed problems with HOTP authorisation on Windows. There have + been problems with the bundled libisds. MinGW does not handle + POSIX extensions of printf formatting strings properly. Patch + for libisds has been added. + * Fixed a non-working PRAGMA statement when asking for a database + integrity check. + * The --version command-line argument now also prints the version + of libraries which Datovka depends on. + * Automatic background downloads didn't cause the deactivation of + download buttons that could still be triggered. Triggering those + buttons in this situation could cause the application to crash. + * Adding new account caused the account tree to collapse. This has + been fixed. +- Changes for 4.5.2 + * NLS of bundled libisds (OS X, Windows) has been disabled. + * The logging of libisds actions has been restricted on Windows + because there are discrepancies from standard-defined behaviour + of some functions on Windows. + * Improved behaviour when message download fails. The error + dialogue is only shown when an explicit message download fails. + * A message in the notification area appears when the download + has been triggered by downloading message list. This should + reduce the amount of error dialogues generated. + * Improved behaviour when downloading messages on accounts with + restricted privileges. Received messages are not automatically + downloaded when the user has no privileges to do that. +- Changes for 4.5.1 + * Fixed bug in action logging causing the application to crash + occasionally. + * Fixed bug where message line was not deleted when deleting from + ISDS failed. + * New account model internals. +- Build with optflags +- Use macros for desktop file and icon handling + ------------------------------------------------------------------- Tue Feb 16 18:29:42 UTC 2016 - tchvatal@suse.com diff --git a/datovka.spec b/datovka.spec index b72b1f0..05456db 100644 --- a/datovka.spec +++ b/datovka.spec @@ -1,7 +1,7 @@ # # spec file for package datovka # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: datovka -Version: 4.5.0 +Version: 4.5.3 Release: 0 Summary: Library to access Czech eGov system \"Datove schranky\" License: LGPL-2.0+ @@ -37,6 +37,10 @@ BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(libisds) Requires: dejavu Requires: libqt5_sql_backend +Requires(post): hicolor-icon-theme +Requires(post): update-desktop-files +Requires(postun): hicolor-icon-theme +Requires(postun): update-desktop-files Recommends: %{name}-lang # Included inside with different approach Obsoletes: python-dslib @@ -51,14 +55,15 @@ Data Box Information System) SOAP services as defined in Czech ISDS Act %prep %setup -q -%patch0 -p1 +%patch0 sed -i \ -e 's:lrelease:lrelease-qt5:g' \ %{name}.pro %build +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" lrelease-qt5 datovka.pro -CFLAGS="%{optflags}" \ %qmake5 PREFIX=%{_prefix} DISABLE_VERSION_CHECK_BY_DEFAULT=1 make %{?_smp_mflags} @@ -71,11 +76,20 @@ sed -i \ %{buildroot}%{_datadir}/applications/datovka.desktop rm -rf %{buildroot}%{_datadir}/datovka/doc +%post +%desktop_database_post +%icon_theme_cache_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun + %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog %{_bindir}/datovka %{_datadir}/applications/datovka.desktop +%dir %{_datadir}/appdata %{_datadir}/appdata/datovka.appdata.xml %dir %{_datadir}/datovka %dir %{_datadir}/datovka/localisations/