diff --git a/datovka-4.18.0.tar.xz b/datovka-4.18.0.tar.xz deleted file mode 100644 index 619aae3..0000000 --- a/datovka-4.18.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d57112450532be66f1c14efaa909ab71c3c34e123a2201393cd0b144808d8ef -size 2966652 diff --git a/datovka-4.18.0.tar.xz.sha256 b/datovka-4.18.0.tar.xz.sha256 deleted file mode 100644 index bf03dae..0000000 --- a/datovka-4.18.0.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -5d57112450532be66f1c14efaa909ab71c3c34e123a2201393cd0b144808d8ef diff --git a/datovka-4.19.0.tar.xz b/datovka-4.19.0.tar.xz new file mode 100644 index 0000000..9e867cb --- /dev/null +++ b/datovka-4.19.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14f27bb1f313ee818e1c4aaa246925b8f548918c70f351495df7c9385db27b6e +size 2978904 diff --git a/datovka-4.19.0.tar.xz.sha256 b/datovka-4.19.0.tar.xz.sha256 new file mode 100644 index 0000000..1878137 --- /dev/null +++ b/datovka-4.19.0.tar.xz.sha256 @@ -0,0 +1 @@ +14f27bb1f313ee818e1c4aaa246925b8f548918c70f351495df7c9385db27b6e diff --git a/datovka-fix-pro.patch b/datovka-fix-pro.patch index dd5c143..2b47748 100644 --- a/datovka-fix-pro.patch +++ b/datovka-fix-pro.patch @@ -40,7 +40,7 @@ Index: datovka-4.13.0/datovka.pro - -g -O0 -std=c++11 \ - -Wall -Wextra -pedantic \ - -Wdate-time -Wformat -Werror=format-security -+ -g -std=c++11 $$(CXXFLAGS) \ ++ -g $$(CXXFLAGS) \ + -Wall -Wextra -pedantic #INCLUDEPATH += diff --git a/datovka.changes b/datovka.changes index 9f9fbd0..0872b1f 100644 --- a/datovka.changes +++ b/datovka.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Feb 1 06:50:56 UTC 2022 - Jiri Slaby + +- Update to 4.19.0 + * Stored message envelope is updated when the type of a commercial message + changes (e.g. when consuming the prepaid answer). + * The application is downloading information about the state of the long term + storage. This build requires libdatovka-0.2.1. + * Messages which are going to be deleted from ISDS can be displayed using a + user-specified colour. + * Fixed a memory leak occurring while initialising the application. + * Fixed compilation when using GCC 11. + * Modified sources to compile with Qt-6.1 and Qt-6.2. Qt-6.0 still causes + compilation issues. (Qt-6.0 should be fixed instead.) + * Fixed a bug in a conversion function causing struct tm to Epoch time + conversion errors when converted value fits within an interval limited by + midnight and the time zone difference. + * Suppressed notification dialogues when uploading into records management + service as too many of them were generated occasionally. +- switch to Qt6 on Tumbleweed + ------------------------------------------------------------------- Mon Aug 30 06:35:45 UTC 2021 - Jiri Slaby diff --git a/datovka.spec b/datovka.spec index 2190f9d..08a40b7 100644 --- a/datovka.spec +++ b/datovka.spec @@ -1,7 +1,7 @@ # # spec file for package datovka # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,18 @@ # +%if 0%{?suse_version} > 1500 +%define qt_version 6 +%define qt_version_full 6.2.0 +%define lrelease lrelease6 +%else +%define qt_version 5 +%define qt_version_full 5.4.1 +%define lrelease lrelease-qt5 +%endif + Name: datovka -Version: 4.18.0 +Version: 4.19.0 Release: 0 Summary: Library to access Czech eGov system "Datove schranky" License: GPL-3.0-or-later @@ -27,26 +37,34 @@ Source0: https://secure.nic.cz/files/datove_schranky/%{version}/%{name}-% Source1: https://secure.nic.cz/files/datove_schranky/%{version}/%{name}-%{version}.tar.xz.sha256 # PATCH-FIX-UPSTREAM: remove some issues with current .pro file Patch0: datovka-fix-pro.patch +%if 0%{qt_version} == 6 +BuildRequires: qt6-tools-linguist +%else BuildRequires: libqt5-linguist +%endif BuildRequires: openssl-devel BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 -BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +BuildRequires: cmake(Qt%{qt_version}Core) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Gui) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Network) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}PrintSupport) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Sql) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Svg) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{qt_version_full} BuildRequires: pkgconfig(libdatovka) >= 0.1.2 -Requires: libqt5_sql_backend +%if 0%{qt_version} == 6 +Requires: qt6-sql-sqlite +%else +Requires: libqt5-sql-sqlite +%endif Recommends: %{name}-lang # Included inside with different approach Obsoletes: python-dslib %if 0%{?suse_version} < 1330 Requires(post): hicolor-icon-theme Requires(post): update-desktop-files -Requires(postun): hicolor-icon-theme -Requires(postun): update-desktop-files +Requires(postun):hicolor-icon-theme +Requires(postun):update-desktop-files %endif %description @@ -59,18 +77,33 @@ Data Box Information System) SOAP services as defined in Czech ISDS Act %prep %autosetup -p1 sed -i \ - -e 's:lrelease:lrelease-qt5:g' \ + -e 's:lrelease:%{lrelease}:g' \ %{name}.pro %build export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" -lrelease-qt5 datovka.pro +%if 0%{qt_version} == 6 +export CXXFLAGS="-std=c++17 %{optflags}" +%else +export CXXFLAGS="-std=c++11 %{optflags}" +%endif +%{lrelease} datovka.pro +%if 0%{qt_version} == 6 +# QMAKE_LIBS_LIBATOMIC= is only temporary to fix: +# "Library 'libatomic' is not defined." +%qmake6 PREFIX=%{_prefix} DISABLE_VERSION_CHECK_BY_DEFAULT=1 QMAKE_LIBS_LIBATOMIC= +%qmake6_build +%else %qmake5 PREFIX=%{_prefix} DISABLE_VERSION_CHECK_BY_DEFAULT=1 %make_jobs +%endif %install +%if 0%{qt_version} == 6 +%qmake6_install +%else %qmake5_install +%endif # fix desktop file sed -i \ @@ -99,6 +132,7 @@ rm -rf %{buildroot}%{_datadir}/datovka/doc %dir %{_datadir}/datovka/localisations/ %{_datadir}/datovka/localisations/datovka_cs.qm %{_datadir}/datovka/localisations/datovka_en.qm +%dir %{_datadir}/icons/hicolor/ %{_datadir}/icons/hicolor/* %changelog