SOURCES/dconf-0.40.0-permissions.patch

@@ -1,31 +0,0 @@
---- a/gvdb/gvdb-builder.c
-+++ b/gvdb/gvdb-builder.c
-@@ -21,6 +21,7 @@
- #include "gvdb-format.h"
- 
- #include <glib.h>
-+#include <glib/gstdio.h>
- #include <fcntl.h>
- #if !defined(G_OS_WIN32) || !defined(_MSC_VER)
- #include <unistd.h>
-@@ -509,13 +510,20 @@ gvdb_table_write_contents (GHashTable   *table,
-   gboolean status;
-   FileBuilder *fb;
-   GString *str;
-+  GStatBuf buf;
-+  gint stat_ret;
- 
-   fb = file_builder_new (byteswap);
-   file_builder_add_hash (fb, table, &root);
-   str = file_builder_serialise (fb, root);
- 
-+  stat_ret = g_stat (filename, &buf);
-+
-   status = g_file_set_contents (filename, str->str, str->len, error);
-   g_string_free (str, TRUE);
- 
-+  if (stat_ret == 0)
-+    g_chmod (filename, buf.st_mode);
-+
-   return status;
- }

SOURCES/dconf-0.40.0-tests-profile.patch

@@ -0,0 +1,38 @@
+From c755ccd699cc0b52f73cfdae30fb7e2c3a46c8c1 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@redhat.com>
+Date: Tue, 12 Nov 2024 15:23:37 +0100
+Subject: [PATCH] tests: Do not use system profile
+
+Set default profile containing "user-db:user"
+so that tests don't use system profile.
+
+Fixes: #58
+---
+ tests/test-dconf.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/tests/test-dconf.py b/tests/test-dconf.py
+index 1f50da8..3ac60d3 100755
+--- a/tests/test-dconf.py
++++ b/tests/test-dconf.py
+@@ -105,10 +105,17 @@ class DBusTest(unittest.TestCase):
+         os.mkdir(self.dbus_dir, mode=0o700)
+         os.mkdir(os.path.join(self.config_home, 'dconf'))
+ 
++        os.environ['DCONF_PROFILE'] = os.path.join(self.temporary_dir.name, 'profile')
+         os.environ['DCONF_BLAME'] = ''
+         os.environ['XDG_RUNTIME_DIR'] = self.runtime_dir
+         os.environ['XDG_CONFIG_HOME'] = self.config_home
+ 
++        # Configure default profile so that the system one
++        # does not affect the tests.
++        path = os.path.join(self.temporary_dir.name, 'profile')
++        with open(path, 'w') as file:
++            file.write('user-db:user')
++
+         # Prepare dbus-daemon config.
+         dbus_daemon_config = os.path.join(self.dbus_dir, 'session.conf')
+         with open(dbus_daemon_config, 'w') as file:
+-- 
+2.47.0
+

SPECS/dconf.spec

@@ -2,15 +2,15 @@
 
 Name:           dconf
 Version:        0.40.0
-Release:        6%{?dist}
+Release:        15%{?dist}
 Summary:        A configuration system
 
-License:        LGPLv2+ and GPLv2+ and GPLv3+
+License:        LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later
 URL:            https://wiki.gnome.org/Projects/dconf
 Source0:        https://download.gnome.org/sources/dconf/0.40/dconf-%{version}.tar.xz
 
 Patch1:         dconf-override.patch
-Patch2:         dconf-0.40.0-permissions.patch
+Patch2:         dconf-0.40.0-tests-profile.patch
 
 BuildRequires:  bash-completion
 BuildRequires:  dbus-devel
@@ -18,15 +18,13 @@ BuildRequires:  gcc
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk-doc
 BuildRequires:  meson
-BuildRequires:  systemd
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  vala
 
 Requires:       dbus
 Requires:       glib2%{?_isa} >= %{glib2_version}
 
-# gvdb code is intended to be copy-pasted into projects
-Provides:       bundled(gvdb)
-
 %description
 dconf is a low-level configuration system. Its main purpose is to provide a
 backend to the GSettings API in GLib.
@@ -107,20 +105,46 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/distro.d/locks
 %{_datadir}/vala
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.40.0-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Wed Nov 20 2024 Marek Kasik <mkasik@redhat.com> - 0.40.0-15
+- Do not use system profile for tests
+- Resolves: RHEL-65653
 
-* Tue Jun 22 2021 Marek Kasik <mkasik@redhat.com> - 0.40.0-5
-- Backport patch for permissions restore
-- Indicate bundle of GVDB
-- Resolves: #1974362
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.40.0-14
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Mon Apr 19 2021 Kalev Lember <klember@redhat.com> - 0.40.0-4
-- Use full path for dconf in posttrans script (#1950829)
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.40.0-13
+- Bump release for June 2024 mass rebuild
+
+* Tue Feb  6 2024 Marek Kasik <mkasik@redhat.com> - 0.40.0-12
+- Migrated to SPDX license
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.40.0-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Aug 04 2021 Kalev Lember <klember@redhat.com> - 0.40.0-5
+- BuildRequire systemd-rpm-macros rather than systemd
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Apr 19 2021 Kalev Lember <klember@redhat.com> - 0.40.0-3
+- Use full path for dconf in posttrans script (#1950829)
 
 * Wed Mar 31 2021 Kalev Lember <klember@redhat.com> - 0.40.0-2
 - Avoid hardcoding man page compression