From 077c79c99f058f5617f2acd25548660bbafaaa502d0ba4e508e66d4de647508e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 13 Feb 2011 21:04:31 +0000 Subject: [PATCH] Accepting request 60719 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/60719 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/dconf?expand=0&rev=21 --- dconf.changes | 38 +++++++++++++++++++++++--------------- dconf.spec | 16 ++++++++++------ 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dconf.changes b/dconf.changes index 49a9f66..8798819 100644 --- a/dconf.changes +++ b/dconf.changes @@ -1,31 +1,39 @@ +------------------------------------------------------------------- +Sun Feb 13 13:56:19 CET 2011 - vuntz@opensuse.org + +- Call relevant macros in %post/%postun: + + %desktop_database_post/postun because the package ships at + least one desktop file. + ------------------------------------------------------------------- Mon Feb 7 14:50:49 UTC 2011 - fcrozat@novell.com - Update to version 0.7.2: - + remove some unused variables (new GCC gives a warning: - bgo#640566, another) - + add a mutex to fix multi-threading issue (bgo#640611) - + don't crash if we have no D-Bus - + clean up symbol exports - + fix a crash in the service when using 'reset' - + drop old linker options that were for libtool + + Remove some unused variables (bgo#640566) + + Add a mutex to fix multi-threading issue (bgo#640611) + + Don't crash if we have no D-Bus + + Clean up symbol exports + + Fix a crash in the service when using 'reset' + + Drop old linker options that were for libtool ------------------------------------------------------------------- Tue Jan 18 09:42:06 UTC 2011 - fcrozat@novell.com - Update to version 0.7.1: - + fix linking with strict linkers + + Fix linking with strict linkers - Changes from version 0.7: - + new library to use dconf with libdbus-1 - + quite a lot of improvements and bug-fixes in dconf-editor - + some bug fixes in the GSettings backend (crashers caused by - use if custom dconf profiles) - + increased Vala dependency to 0.11.4 (required for dconf-editor + + New library to use dconf with libdbus-1 + + Quite a lot of improvements and bug-fixes in dconf-editor + + Some bug fixes in the GSettings backend (crashers caused by + use of custom dconf profiles) + + Increased Vala dependency to 0.11.4 (required for dconf-editor fixes) - Create new subpackage libdconf-dbus-1-0 and libdconf-dbus-devel -- BuildRequires pkgconfig(dbus-1) and update-desktop-files +- Add pkgconfig(dbus-1) and update-desktop-files BuildRequires. +- Drop dconf-fix-dbus-introspection-enumeration.patch: fixed + upstream. - Drop 0001-Bug-639523-crash-when-DCONF_PROFILE-is-set.patch: - fixed upstream + fixed upstream. ------------------------------------------------------------------- Mon Jan 17 12:14:56 UTC 2011 - fcrozat@novell.com diff --git a/dconf.spec b/dconf.spec index 5c1cedc..78a62cc 100644 --- a/dconf.spec +++ b/dconf.spec @@ -30,6 +30,7 @@ Source: %{name}-%{version}.tar.bz2 Source99: baselibs.conf # For directory ownership BuildRequires: dbus-1 +BuildRequires: update-desktop-files BuildRequires: vala-unstable-devel BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gio-2.0) @@ -39,7 +40,6 @@ BuildRequires: pkgconfig(libxml-2.0) %if 0%{?BUILD_FROM_VCS} BuildRequires: gtk-doc %endif -BuildRequires: update-desktop-files # dconf provides a dbus service, but has no dependency on dbus in any way # (because it uses gdbus), so we need an explicit Requires Requires: dbus-1 @@ -118,7 +118,7 @@ have configuration storage systems. %package -n libdconf-dbus-devel License: LGPLv2.1+ -Summary: Simple key-based configuration system -- Development Files +Summary: Simple key-based configuration system -- Development Files Group: Development/Libraries/GNOME Requires: libdconf-dbus-1-0 = %{version} @@ -146,9 +146,7 @@ export SUSE_ASNEEDED=0 %install %makeinstall find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print - %suse_update_desktop_file %{buildroot}%{_datadir}/applications/dconf-editor.desktop - mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db} %post -n libdconf0 -p /sbin/ldconfig @@ -165,6 +163,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db} %postun -n gsettings-backend-dconf %glib2_gio_module_postun +%post editor +%desktop_database_post + +%postun editor +%desktop_database_postun + %files %defattr(-, root, root) %doc COPYING NEWS @@ -175,7 +179,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db} %{_datadir}/dbus-1/services/ca.desrt.dconf.service %{_datadir}/dbus-1/system-services/ca.desrt.dconf.service # alternative databases -%{_sysconfdir}/dconf +%{_sysconfdir}/dconf/ %files -n libdconf0 %defattr(-, root, root) @@ -193,7 +197,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db} %defattr(-, root, root) %{_bindir}/dconf-editor %{_datadir}/applications/dconf-editor.desktop -%{_datadir}/dconf-editor +%{_datadir}/dconf-editor/ %files devel %defattr(-, root, root)