diff --git a/0001-no-check-new-versions.patch b/0001-no-check-new-versions.patch new file mode 100644 index 0000000..9ad06a3 --- /dev/null +++ b/0001-no-check-new-versions.patch @@ -0,0 +1,15 @@ +Do not check for a new version by default. + +diff --git a/src/common.cpp b/src/common.cpp +index cbfabd3..9eb8eaf 100644 +--- a/src/common.cpp ++++ b/src/common.cpp +@@ -74,7 +74,7 @@ GlobPreferences::GlobPreferences(void) + store_additional_data_on_disk(true), + certificate_validation_date(DOWNLOAD_DATE), + check_crl(true), +- check_new_versions(true), ++ check_new_versions(false), + send_stats_with_version_checks(false), + download_on_background(false), + timer_value(10), diff --git a/datovka-4.1.0-src.tar.xz b/datovka-4.1.0-src.tar.xz deleted file mode 100644 index 41452ef..0000000 --- a/datovka-4.1.0-src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21bbbb7c2a49a765ff1c1d5e8ff9ca79b47cd0ec908c7b86321aaf658b2419fb -size 580440 diff --git a/datovka-4.1.2-src.tar.xz b/datovka-4.1.2-src.tar.xz new file mode 100644 index 0000000..c18376b --- /dev/null +++ b/datovka-4.1.2-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cd3957a07f2267f7b0873baed3aadd0fd4cec2c1308b28abcaac72ba29bd00f +size 598524 diff --git a/datovka-fix-pro.patch b/datovka-fix-pro.patch index 85d9f2c..655c1f8 100644 --- a/datovka-fix-pro.patch +++ b/datovka-fix-pro.patch @@ -1,7 +1,7 @@ -Index: datovka-4.1.0/datovka.pro +Index: datovka-4.1.2/datovka.pro =================================================================== ---- datovka-4.1.0.orig/datovka.pro -+++ datovka-4.1.0/datovka.pro +--- datovka-4.1.2.orig/datovka.pro ++++ datovka-4.1.2/datovka.pro @@ -49,7 +49,6 @@ isEqual(QT_MAJOR_VERSION, $${REQUIRED_MA #LIBISDS_PREFIX = "$$HOME/third_party/built" @@ -10,7 +10,20 @@ Index: datovka-4.1.0/datovka.pro VERSION=\\\"$${VERSION}\\\" unix:!macx { -@@ -124,8 +123,11 @@ unix:!macx { +@@ -101,12 +100,6 @@ unix:!macx { + localisation.files += locale/datovka_cs.qm \ + locale/datovka_en.qm + +- additional.path = "$${TEXT_FILES_INST_DIR}" +- additional.files = \ +- AUTHORS \ +- COPYING \ +- README +- + DEFINES += DATADIR=\\\"$$DATADIR\\\" \ + PKGDATADIR=\\\"$$PKGDATADIR\\\" \ + LOCALE_INST_DIR="\"\\\"$${LOCALE_INST_DIR}\\\"\"" \ +@@ -129,8 +122,11 @@ unix:!macx { } } @@ -24,7 +37,7 @@ Index: datovka-4.1.0/datovka.pro -Wall -Wextra -pedantic INCLUDEPATH += \ -@@ -188,11 +190,6 @@ macx { +@@ -196,11 +192,6 @@ macx { locale/datovka_en.qm localisation.files += locale/qtbase_cs.qm diff --git a/datovka.changes b/datovka.changes index 05c0687..f8a9b85 100644 --- a/datovka.changes +++ b/datovka.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Feb 24 12:44:21 UTC 2015 - tchvatal@suse.com + +- Version bump to 4.1.2: + * Various bugfixes +- Add patch to not ask about new version availabilty: + * 0001-no-check-new-versions.patch +- Refreshed patch: + * datovka-fix-pro.patch + ------------------------------------------------------------------- Mon Feb 2 13:50:12 UTC 2015 - tchvatal@suse.com diff --git a/datovka.spec b/datovka.spec index 4ae14a1..721234c 100644 --- a/datovka.spec +++ b/datovka.spec @@ -17,7 +17,7 @@ Name: datovka -Version: 4.1.0 +Version: 4.1.2 Release: 0 Summary: Library to access Czech eGov system \"Datove schranky\" License: LGPL-2.0+ @@ -26,6 +26,8 @@ Url: https://labs.nic.cz/cs/nova-datovka.html Source0: https://secure.nic.cz/files/datove_schranky/%{version}/%{name}-%{version}-src.tar.xz # PATCH-FIX-UPSTREAM: remove some issues with current .pro file Patch0: datovka-fix-pro.patch +# PATCH-FIX-SUSE: do not check for newer versions in app (taken from Fedora) +Patch1: 0001-no-check-new-versions.patch BuildRequires: libqt5-linguist BuildRequires: openssl-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 @@ -50,8 +52,9 @@ Data Box Information System) SOAP services as defined in Czech ISDS Act %{?lang_package} %prep -%setup -q -c %{name} +%setup - %patch0 -p1 +%patch1 -p1 sed -i \ -e 's:lrelease:lrelease-qt5:g' \ %{name}.pro @@ -66,7 +69,7 @@ make install INSTALL_ROOT=%{buildroot} # fix desktop file sed -i \ - -e 's:Office:Office;Network;Email;:g' \ + -e 's:Office;:Office;Network;Email;:g' \ %{buildroot}%{_datadir}/applications/datovka.desktop rm -rf %{buildroot}%{_datadir}/datovka/doc @@ -75,6 +78,7 @@ rm -rf %{buildroot}%{_datadir}/datovka/doc %doc AUTHORS COPYING %{_bindir}/datovka %{_datadir}/applications/datovka.desktop +%{_datadir}/appdata/datovka.appdata.xml %dir %{_datadir}/datovka %dir %{_datadir}/datovka/localisations/ %{_datadir}/datovka/localisations/datovka_cs.qm