pool/dconf
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 58760 from home:fcrozat:gnome3

Browse Source 
I think now we can accept it... Thanks for the update!

OBS-URL: https://build.opensuse.org/request/show/58760
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/dconf?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2011-01-19 15:19:46 +00:00 committed by Git OBS Bridge
parent f58a975411
commit 3712f757c7
5 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dconf-0.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1905655e2d3b1fa5110e75eb434467f9fcfd764992d73681486add7f0f9c7ef7
size 161812

3
dconf-0.7.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04b81606131a59362167e50e84b55ac2af49fdfa3ad4b5b0bdb07dc14bf5bd1d
size 175476

37
dconf-fix-dbus-introspection-enumeration.patch
View File

@ -1,37 +0,0 @@
commit 388974f02f3267e118e2facdb32631331460aa04
Author: Ryan Lortie <desrt@desrt.ca>
Date: Tue Dec 21 12:53:44 2010 -0500
Fix DBus introspection enumeration
It should also work for people who have usernames other than 'desrt'
Closes #634229.
diff --git a/service/dconf-writer.c b/service/dconf-writer.c
index 3cf58f5..3b98efd 100644
--- a/service/dconf-writer.c
+++ b/service/dconf-writer.c
@@ -56,11 +56,13 @@ gchar **
dconf_writer_list_existing (void)
{
GPtrArray *array;
+ gchar *path;
GDir *dir;
+ path = g_build_filename (g_get_user_config_dir (), "dconf", NULL);
array = g_ptr_array_new ();
- if ((dir = g_dir_open ("/home/desrt/.config/dconf", 0, NULL)))
+ if ((dir = g_dir_open (path, 0, NULL)))
{
const gchar *name;
@@ -70,6 +72,7 @@ dconf_writer_list_existing (void)
}
g_ptr_array_add (array, NULL);
+ g_free (path);
return (gchar **) g_ptr_array_free (array, FALSE);
}

25
dconf.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Jan 18 09:42:06 UTC 2011 - fcrozat@novell.com
- Update to version 0.7.1:
+ 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
fixes)
- Create new subpackage libdconf-dbus-1-0 and libdconf-dbus-devel
- BuildRequires pkgconfig(dbus-1) and update-desktop-files
- Drop 0001-Bug-639523-crash-when-DCONF_PROFILE-is-set.patch:
fixed upstream
-------------------------------------------------------------------
Mon Jan 17 12:14:56 UTC 2011 - fcrozat@novell.com
- Add 0001-Bug-639523-crash-when-DCONF_PROFILE-is-set.patch:
fix crash in gnome-settings-daemon under gdm, bgo#639523
- Improve source service support
- Own alternative database path
-------------------------------------------------------------------
Mon Jan 10 14:16:46 UTC 2011 - fcrozat@novell.com

59
dconf.spec
View File

@ -18,7 +18,7 @@
Name: dconf
Version: 0.6
Version: 0.7.1
Release: 1
# NOTE: once vala becomes 0.12, change BuildRequires back away from vala-unstable-devel
# FIXME: remove SUSE_ASNEEDED=0 when this is fixed: https://bugzilla.gnome.org/show_bug.cgi?id=626280
@ -28,11 +28,10 @@ Group: System/Libraries
Url: http://live.gnome.org/dconf
Source: %{name}-%{version}.tar.bz2
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM dconf-fix-dbus-introspection-enumeration.patch vuntz@opensuse.org -- Taken from git
Patch0: dconf-fix-dbus-introspection-enumeration.patch
# For directory ownership
BuildRequires: dbus-1
BuildRequires: vala-unstable-devel
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
@ -40,6 +39,7 @@ 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
@ -62,6 +62,19 @@ dconf is a low-level configuration system. Its main purpose is to
provide a backend to GSettings on platforms that don't already
have configuration storage systems.
%package -n libdconf-dbus-1-0
License: LGPLv2.1+
Summary: Simple key-based configuration system -- Library for D-Bus
Group: System/Libraries
# The library doesn't really work if the dconf service is not reachable, so we
# need a Requires
Requires: %{name} = %{version}
%description -n libdconf-dbus-1-0
dconf is a low-level configuration system. Its main purpose is to
provide a backend to GSettings on platforms that don't already
have configuration storage systems.
%package -n gsettings-backend-dconf
License: LGPLv2.1+
Summary: Simple key-based configuration system -- GSettings Backend
@ -103,14 +116,22 @@ dconf is a low-level configuration system. Its main purpose is to
provide a backend to GSettings on platforms that don't already
have configuration storage systems.
%package -n libdconf-dbus-devel
License: LGPLv2.1+
Summary: Simple key-based configuration system -- Development Files
Group: Development/Libraries/GNOME
Requires: libdconf-dbus-1-0 = %{version}
%description -n libdconf-dbus-devel
dconf is a low-level configuration system. Its main purpose is to
provide a backend to GSettings on platforms that don't already
have configuration storage systems.
%prep
%setup -q
%if !0%{?BUILD_FROM_VCS}
%patch0 -p1
%endif
%if 0%{?BUILD_FROM_VCS}
NOCONFIGURE=1 ./autogen.sh
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
%endif
%build
@ -120,16 +141,24 @@ export SUSE_ASNEEDED=0
--enable-gtk-doc
%endif
%__make %{?_smp_mflags}
%__make V=1 %{?_smp_mflags}
%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
%postun -n libdconf0 -p /sbin/ldconfig
%post -n libdconf-dbus-1-0 -p /sbin/ldconfig
%postun -n libdconf-dbus-1-0 -p /sbin/ldconfig
%post -n gsettings-backend-dconf
%glib2_gio_module_post
@ -145,11 +174,17 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%{_libexecdir}/dconf-service
%{_datadir}/dbus-1/services/ca.desrt.dconf.service
%{_datadir}/dbus-1/system-services/ca.desrt.dconf.service
# alternative databases
%{_sysconfdir}/dconf
%files -n libdconf0
%defattr(-, root, root)
%{_libdir}/libdconf.so.*
%files -n libdconf-dbus-1-0
%defattr(-, root, root)
%{_libdir}/libdconf-dbus-1.so.*
%files -n gsettings-backend-dconf
%defattr(-, root, root)
%{_libdir}/gio/modules/libdconfsettings.so
@ -157,6 +192,8 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%files editor
%defattr(-, root, root)
%{_bindir}/dconf-editor
%{_datadir}/applications/dconf-editor.desktop
%{_datadir}/dconf-editor
%files devel
%defattr(-, root, root)
@ -168,4 +205,10 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%dir %{_datadir}/vala/vapi
%{_datadir}/vala/vapi/dconf.*
%files -n libdconf-dbus-devel
%defattr(-, root, root)
%{_includedir}/dconf-dbus-1/
%{_libdir}/libdconf-dbus-1.so
%{_libdir}/pkgconfig/dconf-dbus-1.pc
%changelog