Accepting request 764962 from home:polslinux:branches:GNOME:Apps

- Add meson version to spec file 
- Remove no longer deja-dup-duplicity-Mark-GPGError-extern.patch
- Update to 40.6:
    + Fixes a bug that prevented backing up to Google Drive accounts with unlimited quotas
    + Updated translations
    + Fix a bug that prevented backing up to Google Drive in some rare situations
    + Fix a bug that prevented the first login to Google Drive
    + Fix a bug that prevented resuming a full backup
    + Fix 2038 date problems by using 64-bit dates internally
    + Fix building against valac 0.45.2 and later
    + Require glib 2.56
    + Require meson 0.47
    + Add optional dependency on libgdk-x11-3.0 (only used in flatpak builds)
    + Make libgoa-1.0 an optional dependency (still recommended for a few years though)
    + Support autostarting via the new Background portal

OBS-URL: https://build.opensuse.org/request/show/764962
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=108

deja-dup-40.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6fc439ba7c28200dabc557ec726c324bb849919c54b65fbc5e01f3f1b90029bb
-size 716851

deja-dup-40.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00178b105cb4c91f172d75a1e484860bd34b3cdfdf3c97fce5c5afcc0cfc8a53
+size 1309271

deja-dup-duplicity-Mark-GPGError-extern.patch

@@ -1,34 +0,0 @@
-From 05422eab47e444525427b4108c64a00721139712 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 10 Jul 2019 13:33:47 +0200
-Subject: [PATCH] duplicity: Mark GPGError as extern and prevent GPG symbols to
- be public API
-
-This also fixes building with vala 0.45.2+
----
- libdeja/tools/duplicity/DuplicityJob.vala | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libdeja/tools/duplicity/DuplicityJob.vala b/libdeja/tools/duplicity/DuplicityJob.vala
-index 82c0c603..00a9f6ab 100644
---- a/libdeja/tools/duplicity/DuplicityJob.vala
-+++ b/libdeja/tools/duplicity/DuplicityJob.vala
-@@ -20,13 +20,13 @@
- using GLib;
- 
- [CCode (cheader_filename = "gpgrt.h", cname = "gpg_err_code_t", cprefix = "GPG_ERR_", has_type_id = false)]
--public enum GPGError {
-+extern enum GPGError {
-   NO_SECKEY = 17,
-   BAD_KEY = 19,
- }
- 
- [CCode (cheader_filename = "gpgrt.h")]
--public extern unowned string gpg_strerror(GPGError code);
-+extern unowned string gpg_strerror(GPGError code);
- 
- internal class DuplicityJob : DejaDup.ToolJob
- {
--- 
-2.22.0
-

deja-dup.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Jan 16 09:08:54 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- Add meson version to spec file 
+- Remove no longer deja-dup-duplicity-Mark-GPGError-extern.patch
+
+-------------------------------------------------------------------
+Thu Jan 16 09:05:52 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 40.6:
+    + Fixes a bug that prevented backing up to Google Drive accounts with unlimited quotas
+    + Updated translations
+    + Fix a bug that prevented backing up to Google Drive in some rare situations
+    + Fix a bug that prevented the first login to Google Drive
+    + Fix a bug that prevented resuming a full backup
+    + Fix 2038 date problems by using 64-bit dates internally
+    + Fix building against valac 0.45.2 and later
+    + Require glib 2.56
+    + Require meson 0.47
+    + Add optional dependency on libgdk-x11-3.0 (only used in flatpak builds)
+    + Make libgoa-1.0 an optional dependency (still recommended for a few years though)
+    + Support autostarting via the new Background portal
+
 -------------------------------------------------------------------
 Mon Sep  2 20:32:41 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 

deja-dup.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package deja-dup
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,13 @@
 
 
 Name:           deja-dup
-Version:        40.1
+Version:        40.6
 Release:        0
 Summary:        Simple backup tool and frontend for duplicity
 License:        GPL-3.0-or-later
 Group:          Productivity/Archiving/Backup
 URL:            https://wiki.gnome.org/Apps/DejaDup
 Source0:        https://gitlab.gnome.org/World/deja-dup/-/archive/%{version}/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM deja-dup-duplicity-Mark-GPGError-extern.patch -- Fix build with new vala
-Patch0:         deja-dup-duplicity-Mark-GPGError-extern.patch
 
 BuildRequires:  appstream-glib
 BuildRequires:  dbus-1
@@ -34,7 +32,7 @@ BuildRequires:  fdupes
 BuildRequires:  gettext-runtime
 BuildRequires:  glib2-tools
 BuildRequires:  libgpg-error-devel
-BuildRequires:  meson
+BuildRequires:  meson >= 0.47
 BuildRequires:  pkgconfig
 BuildRequires:  vala >= 0.16.0
 BuildRequires:  yelp-tools
@@ -104,8 +102,8 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 %meson_test
 
 %files
-%license COPYING.md
-%doc AUTHORS HACKING.md NEWS.md README.md
+%license LICENSES/GPL-3.0-or-later.md
+%doc NEWS.md README.md CONTRIBUTING.md
 %doc %{_datadir}/help/C/deja-dup/
 %{_bindir}/deja-dup
 %{_mandir}/man1/deja-dup.1%{?ext_man}
@@ -116,7 +114,6 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 %{_libexecdir}/deja-dup/deja-dup-monitor
 %{_libexecdir}/deja-dup/duplicity
 %{_datadir}/applications/org.gnome.DejaDup.desktop
-%{_datadir}/GConf/gsettings/deja-dup.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.DejaDup.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/org.gnome.DejaDup*
 %dir %{_libdir}/deja-dup