diff --git a/deja-dup-34.3.tar.xz b/deja-dup-34.3.tar.xz
deleted file mode 100644
index f781585..0000000
--- a/deja-dup-34.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c90a098c2b60fa73d6bcc51d7f8a33fc7c279f2556b677145d50ad0b83c90cf7
-size 702708
diff --git a/deja-dup-35.6.tar.xz b/deja-dup-35.6.tar.xz
new file mode 100644
index 0000000..61a480b
--- /dev/null
+++ b/deja-dup-35.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6a850425c3fcb535f5411cfeab39c3edef976cd5fa9e832f8f2943b051d6292
+size 711036
diff --git a/deja-dup-help2man_stderr.patch b/deja-dup-help2man_stderr.patch
deleted file mode 100644
index 1ddd797..0000000
--- a/deja-dup-help2man_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: deja-dup-34.2/man/CMakeLists.txt
-===================================================================
---- deja-dup-34.2.orig/man/CMakeLists.txt
-+++ deja-dup-34.2/man/CMakeLists.txt
-@@ -21,8 +21,8 @@ string(REPLACE ".po" "" LINGUAS "${POFIL
- 
- add_custom_command(OUTPUT C/deja-dup.1 C/deja-dup-preferences.1
-                    COMMAND mkdir -p C
--                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o C/deja-dup.1
--                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.pref -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o C/deja-dup-preferences.1
-+                   COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o C/deja-dup.1
-+                   COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.pref -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o C/deja-dup-preferences.1
-                    DEPENDS deja-dup deja-dup-preferences)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/C/deja-dup.1 ${CMAKE_CURRENT_BINARY_DIR}/C/deja-dup-preferences.1 DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/man/man1")
- list(APPEND MAN_TARGETS C/deja-dup.1 C/deja-dup-preferences.1)
-@@ -31,8 +31,8 @@ foreach(LINGUA ${LINGUAS})
-   add_custom_command(OUTPUT ${LINGUA}/deja-dup.1 ${LINGUA}/deja-dup-preferences.1
-                      COMMAND mkdir -p ${LINGUA} locales/${LINGUA}/LC_MESSAGES
-                      COMMAND ln -sf ${CMAKE_BINARY_DIR}/po/${LINGUA}.gmo locales/${LINGUA}/LC_MESSAGES/deja-dup.mo
--                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o ${LINGUA}/deja-dup.1
--                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o ${LINGUA}/deja-dup-preferences.1
-+                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o ${LINGUA}/deja-dup.1
-+                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o ${LINGUA}/deja-dup-preferences.1
-                      DEPENDS translations deja-dup deja-dup-preferences)
- 
-   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LINGUA}/deja-dup.1 ${CMAKE_CURRENT_BINARY_DIR}/${LINGUA}/deja-dup-preferences.1 DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/man/${LINGUA}/man1")
diff --git a/deja-dup-vala-0.36.patch b/deja-dup-vala-0.36.patch
deleted file mode 100644
index 9f529c1..0000000
--- a/deja-dup-vala-0.36.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From 5676766be5e845ccb6cdf46cfa8722497f151752 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha@ubuntu.com>
-Date: Fri, 16 Jun 2017 15:11:37 -0400
-Subject: Use 'ref' keyword for iter, requires vala 0.36
-
-
-diff --git a/deja-dup/widgets/ConfigList.vala b/deja-dup/widgets/ConfigList.vala
-index 15de2d6..02cd81a 100644
---- a/deja-dup/widgets/ConfigList.vala
-+++ b/deja-dup/widgets/ConfigList.vala
-@@ -333,7 +333,7 @@ public class ConfigList : ConfigWidget
- 
-     model.row_deleted.disconnect(write_to_config);
-     foreach (Gtk.TreeIter iter in iters) {
--      (model as Gtk.ListStore).remove(iter);
-+      (model as Gtk.ListStore).remove(ref iter);
-     }
-     model.row_deleted.connect(write_to_config);
- 
-diff --git a/deja-dup/widgets/ConfigLocation.vala b/deja-dup/widgets/ConfigLocation.vala
-index 869e2a8..d21c556 100644
---- a/deja-dup/widgets/ConfigLocation.vala
-+++ b/deja-dup/widgets/ConfigLocation.vala
-@@ -397,12 +397,12 @@ public class ConfigLocation : ConfigWidget
-     if (uuid == saved_uuid)
-       return;
- 
--    store.remove(iter);
-+    store.remove(ref iter);
- 
-     if (--num_volumes == 0) {
-       Gtk.TreeIter sep_iter;
-       if (store.get_iter_from_string(out sep_iter, index_vol_sep.to_string())) {
--        store.remove(sep_iter);
-+        store.remove(ref sep_iter);
-         index_vol_sep = -2;
-       }
-     }
--- 
-cgit v0.10.2
-
-From c5f1c4a7fdb172331b18f0cad061b4dbc5e79566 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha@ubuntu.com>
-Date: Fri, 16 Jun 2017 15:16:29 -0400
-Subject: Don't use static for const declarations
-
-
-diff --git a/deja-dup/Assistant.vala b/deja-dup/Assistant.vala
-index 79e254b..18f0cbf 100644
---- a/deja-dup/Assistant.vala
-+++ b/deja-dup/Assistant.vala
-@@ -66,12 +66,12 @@ public abstract class Assistant : Gtk.Window
-   public weak List<PageInfo> current;
-   List<PageInfo> infos;
- 
--  static const int APPLY = 1;
--  static const int BACK = 2;
--  static const int FORWARD = 3;
--  static const int CANCEL = 4;
--  static const int CLOSE = 5;
--  static const int RESUME = 6;
-+  const int APPLY = 1;
-+  const int BACK = 2;
-+  const int FORWARD = 3;
-+  const int CANCEL = 4;
-+  const int CLOSE = 5;
-+  const int RESUME = 6;
- 
-   construct
-   {
-diff --git a/deja-dup/main.vala b/deja-dup/main.vala
-index 88da3e0..f093375 100644
---- a/deja-dup/main.vala
-+++ b/deja-dup/main.vala
-@@ -30,7 +30,7 @@ class DejaDupApp : Object
-   static bool restoremissing_mode = false;
-   static bool prompt_mode = false;
-   static string[] filenames = null;
--  static const OptionEntry[] options = {
-+  const OptionEntry[] options = {
-     {"version", 0, 0, OptionArg.NONE, ref show_version, N_("Show version"), null},
-     {"restore", 0, 0, OptionArg.NONE, ref restore_mode, N_("Restore given files"), null},
-     {"backup", 0, 0, OptionArg.NONE, ref backup_mode, N_("Immediately start a backup"), null},
-diff --git a/deja-dup/monitor/monitor.vala b/deja-dup/monitor/monitor.vala
-index 040fa93..efb26be 100644
---- a/deja-dup/monitor/monitor.vala
-+++ b/deja-dup/monitor/monitor.vala
-@@ -32,7 +32,7 @@ static DejaDup.FilteredSettings settings = null;
- static bool testing_delay = true;
- 
- static bool show_version = false;
--static const OptionEntry[] options = {
-+const OptionEntry[] options = {
-   {"version", 0, 0, OptionArg.NONE, ref show_version, N_("Show version"), null},
-   {null}
- };
-diff --git a/deja-dup/nautilus/NautilusExtension.c b/deja-dup/nautilus/NautilusExtension.c
-index c0c5a29..8051164 100644
---- a/deja-dup/nautilus/NautilusExtension.c
-+++ b/deja-dup/nautilus/NautilusExtension.c
-@@ -273,7 +273,7 @@ deja_dup_nautilus_extension_menu_provider_iface_init (NautilusMenuProviderIface
- 
- void deja_dup_nautilus_extension_register_type (GTypeModule *module)
- {
--  static const GTypeInfo info = {
-+  const GTypeInfo info = {
-     sizeof (DejaDupNautilusExtensionClass),
-     (GBaseInitFunc) NULL,
-     (GBaseFinalizeFunc) NULL,
-@@ -290,7 +290,7 @@ void deja_dup_nautilus_extension_register_type (GTypeModule *module)
-     "DejaDupNautilusExtension",
-     &info, 0);
- 
--  static const GInterfaceInfo menu_provider_iface_info =
-+  const GInterfaceInfo menu_provider_iface_info =
-   {
-     (GInterfaceInitFunc)deja_dup_nautilus_extension_menu_provider_iface_init,
-      NULL,
-diff --git a/deja-dup/preferences/Preferences.vala b/deja-dup/preferences/Preferences.vala
-index 34bf2c0..940cfdc 100644
---- a/deja-dup/preferences/Preferences.vala
-+++ b/deja-dup/preferences/Preferences.vala
-@@ -43,8 +43,8 @@ public class Preferences : Gtk.Grid
-   Gtk.Button restore_button;
-   Gtk.ProgressBar restore_progress;
-   uint bus_watch_id = 0;
--  static const int PAGE_HMARGIN = 24;
--  static const int PAGE_VMARGIN = 12;
-+  const int PAGE_HMARGIN = 24;
-+  const int PAGE_VMARGIN = 12;
- 
-   public Preferences(DejaDup.PreferencesPeriodicSwitch? auto_switch)
-   {
-diff --git a/deja-dup/widgets/ConfigDelete.vala b/deja-dup/widgets/ConfigDelete.vala
-index e6b5124..eaba656 100644
---- a/deja-dup/widgets/ConfigDelete.vala
-+++ b/deja-dup/widgets/ConfigDelete.vala
-@@ -23,8 +23,8 @@ namespace DejaDup {
- 
- public class ConfigDelete : ConfigChoice
- {
--  public static const int SEMIANNUALLY = 365/2;
--  public static const int ANNUALLY = 365;
-+  public const int SEMIANNUALLY = 365/2;
-+  public const int ANNUALLY = 365;
-   public static int FOREVER = int.MAX;
- 
-   public ConfigDelete(string key, string ns="") {
-diff --git a/deja-dup/widgets/ConfigLocation.vala b/deja-dup/widgets/ConfigLocation.vala
-index d21c556..b7de69e 100644
---- a/deja-dup/widgets/ConfigLocation.vala
-+++ b/deja-dup/widgets/ConfigLocation.vala
-@@ -23,12 +23,12 @@ namespace DejaDup {
- 
- public class ConfigLocation : ConfigWidget
- {
--  static const int COL_ICON = 0;
--  static const int COL_TEXT = 1;
--  static const int COL_SORT = 2;
--  static const int COL_UUID = 3;
--  static const int COL_PAGE = 4;
--  static const int COL_INDEX = 5;
-+  const int COL_ICON = 0;
-+  const int COL_TEXT = 1;
-+  const int COL_SORT = 2;
-+  const int COL_UUID = 3;
-+  const int COL_PAGE = 4;
-+  const int COL_INDEX = 5;
- 
-   enum Group {
-     CLOUD = 0,
-diff --git a/libdeja/RecursiveOp.vala b/libdeja/RecursiveOp.vala
-index b5a24a8..5153059 100644
---- a/libdeja/RecursiveOp.vala
-+++ b/libdeja/RecursiveOp.vala
-@@ -84,7 +84,7 @@ public abstract class RecursiveOp : Object
-     op.start_async.begin();
-   }
- 
--  static const int NUM_ENUMERATED = 16;
-+  const int NUM_ENUMERATED = 16;
-   async void do_dir()
-   {
-     handle_dir();
-diff --git a/libdeja/tools/duplicity/DuplicityJob.vala b/libdeja/tools/duplicity/DuplicityJob.vala
-index 49dc239..7be7917 100644
---- a/libdeja/tools/duplicity/DuplicityJob.vala
-+++ b/libdeja/tools/duplicity/DuplicityJob.vala
-@@ -74,7 +74,7 @@ internal class DuplicityJob : DejaDup.ToolJob
-   
-   bool checked_backup_space = false;
- 
--  static const int MINIMUM_FULL = 2;
-+  const int MINIMUM_FULL = 2;
-   bool deleted_files = false;
-   int delete_age = 0;
-   
-@@ -794,36 +794,36 @@ internal class DuplicityJob : DejaDup.ToolJob
-       return false;
-   }
- 
--  protected static const int ERROR_GENERIC = 1;
--  protected static const int ERROR_HOSTNAME_CHANGED = 3;
--  protected static const int ERROR_RESTORE_DIR_NOT_FOUND = 19;
--  protected static const int ERROR_EXCEPTION = 30;
--  protected static const int ERROR_GPG = 31;
--  protected static const int ERROR_BAD_VOLUME = 44;
--  protected static const int ERROR_BACKEND = 50;
--  protected static const int ERROR_BACKEND_PERMISSION_DENIED = 51;
--  protected static const int ERROR_BACKEND_NOT_FOUND = 52;
--  protected static const int ERROR_BACKEND_NO_SPACE = 53;
--  protected static const int INFO_PROGRESS = 2;
--  protected static const int INFO_COLLECTION_STATUS = 3;
--  protected static const int INFO_DIFF_FILE_NEW = 4;
--  protected static const int INFO_DIFF_FILE_CHANGED = 5;
--  protected static const int INFO_DIFF_FILE_DELETED = 6;
--  protected static const int INFO_PATCH_FILE_WRITING = 7;
--  protected static const int INFO_PATCH_FILE_PATCHING = 8;
--  protected static const int INFO_FILE_STAT = 10;
--  protected static const int INFO_SYNCHRONOUS_UPLOAD_BEGIN = 11;
--  protected static const int INFO_ASYNCHRONOUS_UPLOAD_BEGIN = 12;
--  protected static const int INFO_SYNCHRONOUS_UPLOAD_DONE = 13;
--  protected static const int INFO_ASYNCHRONOUS_UPLOAD_DONE = 14;
--  protected static const int WARNING_ORPHANED_SIG = 2;
--  protected static const int WARNING_UNNECESSARY_SIG = 3;
--  protected static const int WARNING_UNMATCHED_SIG = 4;
--  protected static const int WARNING_INCOMPLETE_BACKUP = 5;
--  protected static const int WARNING_ORPHANED_BACKUP = 6;
--  protected static const int WARNING_CANNOT_READ = 10;
--  protected static const int WARNING_CANNOT_PROCESS = 12; // basically, cannot write or change attrs
--  protected static const int DEBUG_GENERIC = 1;
-+  protected const int ERROR_GENERIC = 1;
-+  protected const int ERROR_HOSTNAME_CHANGED = 3;
-+  protected const int ERROR_RESTORE_DIR_NOT_FOUND = 19;
-+  protected const int ERROR_EXCEPTION = 30;
-+  protected const int ERROR_GPG = 31;
-+  protected const int ERROR_BAD_VOLUME = 44;
-+  protected const int ERROR_BACKEND = 50;
-+  protected const int ERROR_BACKEND_PERMISSION_DENIED = 51;
-+  protected const int ERROR_BACKEND_NOT_FOUND = 52;
-+  protected const int ERROR_BACKEND_NO_SPACE = 53;
-+  protected const int INFO_PROGRESS = 2;
-+  protected const int INFO_COLLECTION_STATUS = 3;
-+  protected const int INFO_DIFF_FILE_NEW = 4;
-+  protected const int INFO_DIFF_FILE_CHANGED = 5;
-+  protected const int INFO_DIFF_FILE_DELETED = 6;
-+  protected const int INFO_PATCH_FILE_WRITING = 7;
-+  protected const int INFO_PATCH_FILE_PATCHING = 8;
-+  protected const int INFO_FILE_STAT = 10;
-+  protected const int INFO_SYNCHRONOUS_UPLOAD_BEGIN = 11;
-+  protected const int INFO_ASYNCHRONOUS_UPLOAD_BEGIN = 12;
-+  protected const int INFO_SYNCHRONOUS_UPLOAD_DONE = 13;
-+  protected const int INFO_ASYNCHRONOUS_UPLOAD_DONE = 14;
-+  protected const int WARNING_ORPHANED_SIG = 2;
-+  protected const int WARNING_UNNECESSARY_SIG = 3;
-+  protected const int WARNING_UNMATCHED_SIG = 4;
-+  protected const int WARNING_INCOMPLETE_BACKUP = 5;
-+  protected const int WARNING_ORPHANED_BACKUP = 6;
-+  protected const int WARNING_CANNOT_READ = 10;
-+  protected const int WARNING_CANNOT_PROCESS = 12; // basically, cannot write or change attrs
-+  protected const int DEBUG_GENERIC = 1;
- 
-   void delete_cache()
-   {
-diff --git a/libdeja/tools/duplicity/DuplicityPlugin.vala b/libdeja/tools/duplicity/DuplicityPlugin.vala
-index 0c8e9e4..ca3b1d0 100644
---- a/libdeja/tools/duplicity/DuplicityPlugin.vala
-+++ b/libdeja/tools/duplicity/DuplicityPlugin.vala
-@@ -28,9 +28,9 @@ public class DuplicityPlugin : DejaDup.ToolPlugin
-     name = "Duplicity";
-   }
- 
--  static const int REQUIRED_MAJOR = 0;
--  static const int REQUIRED_MINOR = 6;
--  static const int REQUIRED_MICRO = 23;
-+  const int REQUIRED_MAJOR = 0;
-+  const int REQUIRED_MINOR = 6;
-+  const int REQUIRED_MICRO = 23;
-   void do_initial_setup () throws Error
-   {
-     string output;
--- 
-cgit v0.10.2
-
-
-
-
diff --git a/deja-dup.changes b/deja-dup.changes
index 3f43397..9ab12a6 100644
--- a/deja-dup.changes
+++ b/deja-dup.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Thu Sep  7 22:47:54 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 35.6:
+  + Fix a potential memory leak in the monitor daemon and few other
+    bugs.
+- Changes from version 35.5:
+  + Improve on-the-fly dependency installation and fixes a few
+    other interaction bugs.
+- Changes from version 35.4:
+  + Add support for GNOME Online Accounts and cleans up the
+    interface a bit.
+- Changes from version 35.3:
+  + Fix some bugs around unicode filenames and network access.
+- Changes from version 35.2:
+  + Fix a crash we cause in nautilus with our extension.
+- Changes from version 35.1:
+  + Fix a header-color bug introduced in the previous release and
+    also try to fix a long-standing bug around backup/restore
+    buttons being disabled too often.
+- Changes from version 35.0:
+  + Modernize the code base in a few ways that make the experience
+    better in GNOME 3.
+- Add meson BuildRequires and switch cmake macros cmake, make and
+  cmake_install to meson, meson_build and meson_install following
+  upstream switch to Meson build system.
+- Drop intltool BuildRequires: No longer needed.
+- Add libgpg-error-devel, pkgconfig(appstream-builder) and
+  pkgconfig(goa-1.0) BuildRequires: New dependencies.
+- Drop deja-dup-vala-0.36.patch: Fixed upstream.
+- Drop deja-dup-help2man_stderr.patch: No longer needed after the
+  port to meson.
+- Drop handling of localized man pages in install section, no
+  longer needed.
+- Drop suse_update_desktop files macros, no longer needed.
+- Drop obsolete post(un) handling of following macros:
+  glib2_gsettings_schema_post(un), desktop_database_post(un) and
+  icon_theme_cache_post(un).
+
 -------------------------------------------------------------------
 Thu Jun 29 08:52:33 UTC 2017 - tchvatal@suse.com
 
diff --git a/deja-dup.spec b/deja-dup.spec
index 8639f9b..ab39038 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -17,36 +17,34 @@
 
 
 Name:           deja-dup
-Version:        34.3
+Version:        35.6
 Release:        0
-# FIXME: reenable "make check" in %%check, when lp#940110 is fixed
 Summary:        Simple backup tool and frontend for duplicity
 License:        GPL-3.0+
 Group:          Productivity/Archiving/Backup
 Url:            https://launchpad.net/deja-dup
-Source0:        https://launchpad.net/deja-dup/34/%{version}/+download/%{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE deja-dup-help2man_stderr.patch sfalken@opensuse.org -- fixes help2man failure in build
-Patch0:         deja-dup-help2man_stderr.patch
-# PATCH-FIX-UPSTREAM deja-dup-vala-0.36.patch lp#1668915 dimstar@opensuse.org -- Fix build with vala 0.36
-Patch1:         deja-dup-vala-0.36.patch
+Source0:        https://launchpad.net/deja-dup/36/%{version}/+download/%{name}-%{version}.tar.xz
 # For make check to work, we need dbus-launch
-BuildRequires:  cmake
 BuildRequires:  dbus-1-x11
 BuildRequires:  fdupes
-BuildRequires:  intltool
+BuildRequires:  libgpg-error-devel
+BuildRequires:  meson
 BuildRequires:  perl-gettext
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.16.0
 BuildRequires:  yelp-tools
+BuildRequires:  pkgconfig(appstream-builder)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.0
+BuildRequires:  pkgconfig(goa-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)
-Recommends:     duplicity >= 0.6.25
 Recommends:     %{name}-lang
+Recommends:     duplicity >= 0.6.25
 Recommends:     python-boto
 Recommends:     python-cloudfiles
 %glib2_gsettings_schema_requires
@@ -84,89 +82,57 @@ Features:
 This package contains a plugin to integrate Déjà Dup into Nautilus.
 
 %lang_package
+
 %prep
 %setup -q
-%patch0 -p1
-if pkg-config --atleast-version=0.36 vapigen; then
-%patch1 -p1
-fi
 
 %build
 export CFLAGS="%{optflags} -Wl,-rpath=%{_libdir}/%{name}"
 export CXXFLAGS="%{optflags} -Wl,-rpath=%{_libdir}/%{name}"
-%cmake \
- -DENABLE_NAUTILUS=ON \
- -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
- -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir}
-%__make %{?_smp_mflags}
+%{meson}
+%{meson_build}
 
 %install
-%cmake_install
-find %{buildroot} -type f -name "*.la" -delete -print
-%suse_update_desktop_file deja-dup
-%suse_update_desktop_file deja-dup-monitor
-%suse_update_desktop_file -r deja-dup-preferences GTK GNOME System Archiving X-SuSE-Backup
+%{meson_install}
+
 %find_lang %{name} %{?no_lang_C}
-# Localized man pages
-for man in %{buildroot}%{_mandir}/*/man1/*; do
-    LOCALE=`echo $man | sed "s:.*%{_mandir}/\([^/]*\)/man1/.*:\1:g"`
-    echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE" >> %{name}.man-lang.tmp
-    echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang.tmp
-    echo "%%lang($LOCALE) %%doc /${man##%{buildroot}}*" >> %{name}.man-lang.tmp
-done
-sort -u %{name}.man-lang.tmp > %{name}.man-lang
-rm %{name}.man-lang.tmp
-# create symlinks for man pages
-%fdupes -s %{buildroot}%{_mandir}
-# create hardlinks for the rest
 %fdupes %{buildroot}
 
 %check
-# FIXME: disabled because of lp#940110
-#make check
+# Disabled as it currently fails a lot of tests.
+#%%meson_test
 
-%post
-%glib2_gsettings_schema_post
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun
-%glib2_gsettings_schema_postun
-%desktop_database_postun
-%icon_theme_cache_postun
-
-%files -f %{name}.man-lang
-%defattr(-,root,root)
+%files
 %doc AUTHORS COPYING NEWS
-%doc %{_datadir}/help/C/%{name}/
+%doc %{_datadir}/help/C/org.gnome.DejaDup/
 %{_bindir}/deja-dup
-%{_bindir}/deja-dup-preferences
-%{_mandir}/man1/deja-dup.*
-%{_mandir}/man1/deja-dup-preferences.*
-%{_sysconfdir}/xdg/autostart/deja-dup-monitor.desktop
+%{_mandir}/man1/deja-dup.1%{?ext_man}
+%{_sysconfdir}/xdg/autostart/org.gnome.DejaDup.Monitor.desktop
 # We explicitly list the content of %%{_libexecdir}/deja-dup to make sure we
 # put the files in the right subpackage
 %dir %{_libexecdir}/deja-dup
 %{_libexecdir}/deja-dup/deja-dup-monitor
+%{_libexecdir}/deja-dup/duplicity
 %{_libexecdir}/deja-dup/tools/
-%{_datadir}/applications/deja-dup.desktop
-%{_datadir}/applications/deja-dup-preferences.desktop
-%{_datadir}/%{name}/
+%{_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/scalable/apps/deja-dup-symbolic.svg
-%{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg
-%{_datadir}/icons/hicolor/*/apps/deja-dup.png
+%{_datadir}/icons/hicolor/*/apps/org.gnome.DejaDup*
 %dir %{_libdir}/deja-dup
 %{_libdir}/deja-dup/libdeja.so
 %{_libdir}/deja-dup/libwidgets.so
-%dir %{_datadir}/appdata/
-%{_datadir}/appdata/deja-dup.appdata.xml
+%dir %{_datadir}/metainfo
+%{_datadir}/metainfo/org.gnome.DejaDup.appdata.xml
+%dir %{_datadir}/polkit-1
+%dir %{_datadir}/polkit-1/actions
+%{_datadir}/polkit-1/actions/org.gnome.DejaDup.policy
+%{_datadir}/dbus-1/services/org.gnome.DejaDup.service
 
 %files -n nautilus-deja-dup
-%defattr(-,root,root)
 %{_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