diff --git a/dconf-0.40.0.tar.xz b/dconf-0.40.0.tar.xz deleted file mode 100644 index 16bc38555d8767bd5dcbb9bcf1d322be94da87d5..0000000000000000000000000000000000000000 Binary files a/dconf-0.40.0.tar.xz and /dev/null differ diff --git a/dconf-0.49.0.tar.xz b/dconf-0.49.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..765a108f917728f34301c1d127bfbc9fb81267b6 Binary files /dev/null and b/dconf-0.49.0.tar.xz differ diff --git a/dconf.spec b/dconf.spec index 8b1c0f186ff3abd603a933ce559a6c7c29b2a5c1..0a0790893b177c1fba8d2497790934ef066e1ce3 100644 --- a/dconf.spec +++ b/dconf.spec @@ -1,16 +1,26 @@ Name: dconf -Version: 0.40.0 -Release: 3 +Version: 0.49.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.40/%{name}-%{version}.tar.xz +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://gitlab.gnome.org/GNOME/dconf +Source0: https://download.gnome.org/sources/%{name}/%{version_major_minor}/%{name}-%{version}.tar.xz Patch9000: memset-chunk-date-to-eliminate-discrepancy.patch -BuildRequires: bash-completion dbus-devel glib2-devel >= 2.44.0 gtk-doc meson vala libxslt -Requires: dbus glib2%{?_isa} >= 2.44.0 +BuildRequires: meson >= 0.60.0 +BuildRequires: pkgconfig(bash-completion) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(gio-2.0) >= 2.25.7 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.25.7 +BuildRequires: pkgconfig(glib-2.0) >= 2.67.4 +BuildRequires: pkgconfig(vapigen) +BuildRequires: gtk-doc +BuildRequires: /usr/bin/xsltproc +%{?systemd_requires} + +Requires: dbus glib2%{?_isa} >= 2.67.4 %description Dconf is a low-level configuration system. Its main purpose is to provide a backend @@ -23,17 +33,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Includes header files, static library and other development files for dconf. -%package help -Summary: Document files for dconf - -%description help -This package contains some readme, man and other related files for dconf. +%package_help %prep %autosetup -n %{name}-%{version} -p1 %build -%meson -Dgtk_doc=true +%meson -Dgtk_doc=true -Dsystemduserunitdir=%{_userunitdir} %meson_build %check @@ -42,9 +48,7 @@ This package contains some readme, man and other related files for dconf. %install %meson_install - -install -d $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile -install -d $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/{site,local,distro}.d/locks +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/profile cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/profile/user user-db:user @@ -53,8 +57,21 @@ system-db:site system-db:distro EOF +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/local.d/locks +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/site.d/locks +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/distro.d/locks + %posttrans -dconf update +%{_bindir}/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 @@ -67,13 +84,13 @@ 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 %{_bindir}/dconf %{_libdir}/libdconf.so.1* -%{_libdir}/gio/modules/libdconfsettings.so -%{_datadir}/bash-completion/completions/dconf -%{_datadir}/dbus-1/services/ca.desrt.dconf.service -%config(noreplace) %{_sysconfdir}/dconf/profile/user +%{bash_completions_dir}/dconf %{_userunitdir}/dconf.service %files devel @@ -81,17 +98,18 @@ dconf update %{_libdir}/libdconf.so %{_libdir}/pkgconfig/dconf.pc %{_datadir}/vala -%{_datadir}/gtk-doc/html/dconf %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/dconf %files help -%{_mandir}/man1/dconf-service.1.gz -%{_mandir}/man1/dconf.1.gz -%{_mandir}/man7/dconf.7.gz +%{_mandir}/man?/* %changelog -* Thu Apr 7 2022 liuyumeng -0.40.0-3 +* Tue Oct 14 2025 Funda Wang - 0.49.0-1 +- update to 0.49.0 + +* Thu Apr 7 2022 liuyumeng - 0.40.0-3 - enable tests,remove redundant files * Tue Jan 18 2022 liuyumeng - 0.40.0-2 diff --git a/dconf.yaml b/dconf.yaml index 96eb4a94bad387a1206fe6e913f6ec636668f0bc..6f7fbb897a401b161e57e0d055b445b183bafbe4 100644 --- a/dconf.yaml +++ b/dconf.yaml @@ -1,4 +1,4 @@ version_control: gitlab.gnome src_repo: dconf -tag_prefix: ^v -seperator: . +tag_prefix: +separator: . diff --git a/memset-chunk-date-to-eliminate-discrepancy.patch b/memset-chunk-date-to-eliminate-discrepancy.patch index d8f5ef9a3c85f188cb7ff7e52cc9f7f2dd9c27a0..b64c8cdb315a7cd87c07d556688ed5fa21f18ea5 100644 --- a/memset-chunk-date-to-eliminate-discrepancy.patch +++ b/memset-chunk-date-to-eliminate-discrepancy.patch @@ -7,11 +7,11 @@ Subject: [PATCH] dconf read random contents of memory causing discrepancy,initia gvdb/gvdb-builder.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/gvdb/gvdb-builder.c b/gvdb/gvdb-builder.c -index 2383e60..31e2d8f 100644 ---- a/gvdb/gvdb-builder.c -+++ b/gvdb/gvdb-builder.c -@@ -239,6 +239,7 @@ file_builder_allocate (FileBuilder *fb, +diff --git a/subprojects/gvdb/gvdb/gvdb-builder.c b/subprojects/gvdb/gvdb/gvdb-builder.c +index ef01c69..8f126ad 100644 +--- a/subprojects/gvdb/gvdb/gvdb-builder.c ++++ b/subprojects/gvdb/gvdb/gvdb-builder.c +@@ -241,6 +241,7 @@ file_builder_allocate (FileBuilder *fb, chunk->offset = fb->offset; chunk->size = size; chunk->data = g_malloc (size);