From 19c9fecbd46394985d3f25a8862765b810937f18 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 18 Feb 2021 20:00:32 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/dconf.git#16d39bf16be6958af9288194710b6919b6d1b5a6 --- .gitignore | 1 + dconf.spec | 22 ++++++++++++++++++---- sources | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f295c2b..6c65c12 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ dconf-0.5.tar.bz2 /dconf-0.35.1.tar.xz /dconf-0.36.0.tar.xz /dconf-0.38.0.tar.xz +/dconf-0.39.1.tar.xz diff --git a/dconf.spec b/dconf.spec index 87deee3..f4a55a9 100644 --- a/dconf.spec +++ b/dconf.spec @@ -1,13 +1,13 @@ %define glib2_version 2.44.0 Name: dconf -Version: 0.38.0 -Release: 2%{?dist} +Version: 0.39.1 +Release: 1%{?dist} Summary: A configuration system License: LGPLv2+ and GPLv2+ and GPLv3+ URL: https://wiki.gnome.org/Projects/dconf -Source0: https://download.gnome.org/sources/dconf/0.38/dconf-%{version}.tar.xz +Source0: https://download.gnome.org/sources/dconf/0.39/dconf-%{version}.tar.xz Patch1: dconf-override.patch @@ -17,6 +17,7 @@ BuildRequires: gcc BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk-doc BuildRequires: meson +BuildRequires: systemd BuildRequires: vala Requires: dbus @@ -60,6 +61,15 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/distro.d/locks %posttrans dconf update +%post +%systemd_user_post dconf.service + +%preun +%systemd_user_preun dconf.service + +%postun +%systemd_user_postun_with_restart dconf.service + %files %license COPYING %dir %{_sysconfdir}/dconf @@ -71,6 +81,7 @@ dconf update %dir %{_sysconfdir}/dconf/db/distro.d %dir %{_sysconfdir}/dconf/db/distro.d/locks %dir %{_sysconfdir}/dconf/profile +%config(noreplace) %{_sysconfdir}/dconf/profile/user %{_libdir}/gio/modules/libdconfsettings.so %{_libexecdir}/dconf-service %{_datadir}/dbus-1/services/ca.desrt.dconf.service @@ -80,7 +91,7 @@ dconf update %{_mandir}/man1/dconf-service.1.gz %{_mandir}/man1/dconf.1.gz %{_mandir}/man7/dconf.7.gz -%config(noreplace) %{_sysconfdir}/dconf/profile/user +%{_userunitdir}/dconf.service %files devel %{_includedir}/dconf @@ -92,6 +103,9 @@ dconf update %{_datadir}/vala %changelog +* Thu Feb 18 2021 Kalev Lember - 0.39.1-1 +- Update to 0.39.1 + * Tue Jan 26 2021 Fedora Release Engineering - 0.38.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 16d79cd..060dd36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dconf-0.38.0.tar.xz) = 795f723f34a8406a06323870f8425ca579bbc751c1661db02e170532f6a2653aee749cbb84ad4d7e5a84a07c0caf2662a868b34b6f0d383361c0ff1ad9aed355 +SHA512 (dconf-0.39.1.tar.xz) = 375026248737eadc9c288e3293713df0fe6e861dd91b2f2903a4e9e07c7f0af27f5bb1845f46ccd6309fdd890cc9c7b7b0d91f19311bef8527795cb1f20edd63