!6 update release to 0.36.0

Merge pull request !6 from tianwei/master

dconf-override.patch

@@ -0,0 +1,23 @@
+diff --git a/engine/dconf-engine-source-user.c b/engine/dconf-engine-source-user.c
+index 1657875..e4f8786 100644
+--- a/engine/dconf-engine-source-user.c
++++ b/engine/dconf-engine-source-user.c
+@@ -39,11 +39,17 @@ dconf_engine_source_user_open_gvdb (const gchar *name)
+ {
+   GvdbTable *table;
+   gchar *filename;
++  const gchar *override;
++
++  override = g_getenv ("DCONF_USER_CONFIG_DIR");
++  if (override == NULL)
++    filename = g_build_filename (g_get_user_config_dir (), "dconf", name, NULL);
++  else
++    filename = g_build_filename (g_get_home_dir (), override, name, NULL);
+ 
+   /* This can fail in the normal case of the user not having any
+    * settings.  That's OK and it shouldn't be considered as an error.
+    */
+-  filename = g_build_filename (g_get_user_config_dir (), "dconf", name, NULL);
+   table = gvdb_table_new (filename, FALSE, NULL);
+   g_free (filename);
+ 

dconf.spec

@@ -1,13 +1,13 @@
 Name:           dconf
-Version:        0.34.0
-Release:        2
+Version:        0.36.0
+Release:        1
 Summary:        Dconf provides a backend to the GSettings API in Glib
 
 License:        LGPLv2+ and GPLv2+ and GPLv3+
 URL:            http://live.gnome.org/%{name}
-Source0:        http://download.gnome.org/sources/%{name}/0.30/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/%{name}/0.36/%{name}-%{version}.tar.xz
 
-Patch0:		fix-optimize-test-cases-bug.patch
+Patch0:		dconf-override.patch
 BuildRequires:  bash-completion dbus-devel glib2-devel >= 2.44.0 gtk-doc meson vala libxslt
 Requires:       dbus glib2%{?_isa} >= 2.44.0
 
@@ -86,6 +86,12 @@ dconf update
 %{_mandir}/man7/dconf.7.gz
 
 %changelog
+* Mon Jun 30 2020 wenzhanli <wenzhanli2@huawei.com> - 0.36.0-1
+- Type:bugfix
+- ID:NAr
+- SUG:NAr
+- DESC:Upgrade to 0.36.0
+
 * Mon Jun 29 2020 wenzhanli <wenzhanli2@huawei.com> - 0.34.0-2
 - Type:bugfix
 - ID:NA

fix-optimize-test-cases-bug.patch

@@ -1,25 +0,0 @@
-From 0f47a97ee80de3580603132a907fba85ac61d2c5 Mon Sep 17 00:00:00 2001
-From: Ting-Wei-Lan 
-Date: Wed, 23 Jun 2019 11:37:03 +0800
-Subject: [PATCH] 
-
----
- common/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common/meson.build b/common/meson.build
-index 58e0fa8..61af2f9 100644
---- a/common/meson.build
-+++ b/common/meson.build
-@@ -28,7 +28,7 @@ libdconf_common = static_library(
- 
- libdconf_common_dep = declare_dependency(
-   dependencies: glib_dep,
--  link_whole: libdconf_common,
-+  link_with: libdconf_common,
- )
- 
- libdconf_common_hidden = static_library(
--- 
-1.8.3.1
-