From 57d0112e4f68f1d14d86e494d4158092b3f208ef513038f514fb3e377a2f3a02 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 5 Oct 2017 12:24:47 +0000
Subject: [PATCH] Accepting request 531556 from GNOME:Next

1

OBS-URL: https://build.opensuse.org/request/show/531556
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/dconf?expand=0&rev=95
---
 dconf-0.26.0.tar.xz |  3 ---
 dconf-0.26.1.tar.xz |  3 +++
 dconf.changes       |  7 +++++++
 dconf.spec          | 10 +++++-----
 4 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 dconf-0.26.0.tar.xz
 create mode 100644 dconf-0.26.1.tar.xz

diff --git a/dconf-0.26.0.tar.xz b/dconf-0.26.0.tar.xz
deleted file mode 100644
index 842c190..0000000
--- a/dconf-0.26.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8683292eb31a3fae31e561f0a4220d8569b0f6d882e9958b68373f9043d658c9
-size 219688
diff --git a/dconf-0.26.1.tar.xz b/dconf-0.26.1.tar.xz
new file mode 100644
index 0000000..5ddde16
--- /dev/null
+++ b/dconf-0.26.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535
+size 218516
diff --git a/dconf.changes b/dconf.changes
index baad441..06a8253 100644
--- a/dconf.changes
+++ b/dconf.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct  3 20:33:13 UTC 2017 - luc14n0@linuxmail.org
+
+- Update to version 0.26.1:
+  + Work around a deadlock in GObject type initialization
+    (bgo#674885).
+
 -------------------------------------------------------------------
 Thu Mar  2 14:36:50 UTC 2017 - fezhang@suse.com
 
diff --git a/dconf.spec b/dconf.spec
index 31b459e..700968a 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -17,13 +17,13 @@
 
 
 Name:           dconf
-Version:        0.26.0
+Version:        0.26.1
 Release:        0
 Summary:        Simple key-based configuration system
 License:        LGPL-2.1+
 Group:          System/Libraries
-Url:            http://live.gnome.org/dconf
-Source:         http://download.gnome.org/sources/dconf/0.26/%{name}-%{version}.tar.xz
+Url:            https://live.gnome.org/dconf
+Source:         https://download.gnome.org/sources/dconf/0.26/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM 0001-gvdb-Restore-permissions-on-changed-files.patch bsc#1025721 bsc#971074 bgo#758066 fezhang@suse.com -- Restore permissions on files changed by dconf update.
 Patch0:         0001-gvdb-Restore-permissions-on-changed-files.patch
@@ -51,9 +51,9 @@ have configuration storage systems.
 
 %package -n libdconf1
 Summary:        Simple key-based configuration system -- Library
-Group:          System/Libraries
 # The library doesn't really work if the dconf service is not reachable, so we
 # need a Requires
+Group:          System/Libraries
 Requires:       %{name} >= %{version}
 # libdconf-dbus-1-0 is no longer supported with dconf 0.25.x+
 Obsoletes:      libdconf-dbus-1-0 < %{version}
@@ -108,7 +108,7 @@ have configuration storage systems.
 %__make V=1 %{?_smp_mflags}
 
 %install
-%makeinstall
+%make_install
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}