From 1aa1dbf3d18f3a1b6ba259767b94466a87df40e3f653b6e6deb896087d0ae966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Tue, 26 Feb 2019 17:33:36 +0000
Subject: [PATCH] Accepting request 679418 from GNOME:Next

New upstream release

OBS-URL: https://build.opensuse.org/request/show/679418
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=102
---
 deja-dup-38.3.tar.xz  |  3 ---
 deja-dup-38.4.tar.bz2 |  3 +++
 deja-dup.changes      | 20 ++++++++++++++++++++
 deja-dup.spec         | 15 ++++++---------
 4 files changed, 29 insertions(+), 12 deletions(-)
 delete mode 100644 deja-dup-38.3.tar.xz
 create mode 100644 deja-dup-38.4.tar.bz2

diff --git a/deja-dup-38.3.tar.xz b/deja-dup-38.3.tar.xz
deleted file mode 100644
index 7b6f69f..0000000
--- a/deja-dup-38.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9199bc30bf91f9892af99b0933d3eb3e047fec8c5b9d1e73bed38d2b67f5b186
-size 708404
diff --git a/deja-dup-38.4.tar.bz2 b/deja-dup-38.4.tar.bz2
new file mode 100644
index 0000000..a5650cd
--- /dev/null
+++ b/deja-dup-38.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f06d7f0a4eeb9ba939554dd877c0d1c6a3dbb47cfb7114efc1b46688fc2ee513
+size 711900
diff --git a/deja-dup.changes b/deja-dup.changes
index fb8901e..ead1dee 100644
--- a/deja-dup.changes
+++ b/deja-dup.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Feb 26 16:17:54 UTC 2019 - bjorn.lie@gmail.com
+
+- Update to version 38.4:
+  + Update app icon.
+  + Don't run monitor when automatic backups are disabled.
+  + Drop libpeas dependency.
+  + Fix compilation with valac 0.43.
+  + Be more forgiving if packagekit is unresponsive.
+  + Updated translations.
+- Drop deja-dup-fix-build-vala043.patch: Fixed upstream.
+- Drop pkgconfig(libpeas-1.0) BuildRequires: No longer needed.
+
+-------------------------------------------------------------------
+Sun Feb 10 13:39:18 UTC 2019 - bjorn.lie@gmail.com
+
+- Add deja-dup-fix-build-vala043.patch: Fix build with new vala
+  0.43.x.
+- Disable meson_test, currently fails.
+
 -------------------------------------------------------------------
 Thu Jan 17 17:23:57 UTC 2019 - bjorn.lie@gmail.com
 
diff --git a/deja-dup.spec b/deja-dup.spec
index 3e282b4..bbab7dd 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -17,13 +17,14 @@
 
 
 Name:           deja-dup
-Version:        38.3
+### FIXME ### Reenable meson_test on next version bump
+Version:        38.4
 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://launchpad.net/deja-dup/38/%{version}/+download/%{name}-%{version}.tar.xz
+Source0:        https://gitlab.gnome.org/World/deja-dup/-/archive/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRequires:  appstream-glib
 BuildRequires:  dbus-1
@@ -44,7 +45,6 @@ BuildRequires:  pkgconfig(goa-backend-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22
 BuildRequires:  pkgconfig(libnautilus-extension)
 BuildRequires:  pkgconfig(libnotify) >= 0.7
-BuildRequires:  pkgconfig(libpeas-1.0)
 BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(packagekit-glib2) >= 0.6.5
 Recommends:     %{name}-lang
@@ -99,12 +99,12 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 %fdupes %{buildroot}%{_datadir}
 
 %check
-%meson_test
+#%%meson_test
 
 %files
 %license COPYING
-%doc AUTHORS HACKING NEWS
-%doc %{_datadir}/help/C/org.gnome.DejaDup/
+%doc AUTHORS HACKING NEWS.md README.md
+%doc %{_datadir}/help/C/deja-dup/
 %{_bindir}/deja-dup
 %{_mandir}/man1/deja-dup.1%{?ext_man}
 %{_sysconfdir}/xdg/autostart/org.gnome.DejaDup.Monitor.desktop
@@ -113,7 +113,6 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 %dir %{_libexecdir}/deja-dup
 %{_libexecdir}/deja-dup/deja-dup-monitor
 %{_libexecdir}/deja-dup/duplicity
-%{_libexecdir}/deja-dup/tools/
 %{_datadir}/applications/org.gnome.DejaDup.desktop
 %{_datadir}/GConf/gsettings/deja-dup.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.DejaDup.gschema.xml
@@ -132,7 +131,5 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 %{_libdir}/nautilus/extensions-3.0/libdeja-dup.so
 
 %files lang -f %{name}.lang
-%exclude %{_datadir}/help/C/org.gnome.DejaDup/
-%doc %{_datadir}/help/*/org.gnome.DejaDup/
 
 %changelog