diff --git a/dconf-0.30.0.tar.xz b/dconf-0.30.0.tar.xz deleted file mode 100644 index c59809d..0000000 Binary files a/dconf-0.30.0.tar.xz and /dev/null differ diff --git a/dconf-0.34.0.tar.xz b/dconf-0.34.0.tar.xz new file mode 100644 index 0000000..916c771 Binary files /dev/null and b/dconf-0.34.0.tar.xz differ diff --git a/dconf-override.patch b/dconf-override.patch deleted file mode 100644 index 0e95c22..0000000 --- a/dconf-override.patch +++ /dev/null @@ -1,23 +0,0 @@ -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); - diff --git a/dconf.spec b/dconf.spec index aaea641..e2cc5b3 100644 --- a/dconf.spec +++ b/dconf.spec @@ -1,15 +1,12 @@ Name: dconf -Version: 0.30.0 -Release: 2 +Version: 0.34.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 -#this patch comes from fedora/redhat repository -Patch0001: 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 @@ -88,6 +85,12 @@ dconf update %{_mandir}/man7/dconf.7.gz %changelog +* Thu Jan 9 2020 openEuler Buildteam - 0.34.0-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:upgrade to 0.34.0 + * Wed Sep 19 2019 yanzhihua - 0.30.0-2 - Package init.