Accepting request 58229 from GNOME:Factory

Accepted submit request 58229 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/58229
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dconf?expand=0&rev=7

dconf-0.5.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6
-size 251287

dconf-0.6.tar.bz2

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

dconf-fix-dbus-introspection-enumeration.patch

@@ -0,0 +1,37 @@
+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);
+ }

dconf.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Mon Jan 10 14:16:46 UTC 2011 - fcrozat@novell.com
+
+- Add support for source service checkout, with %BUILD_FROM_VCS:
+ + Add gtk-doc BuildRequires.
+ + Add call to ./autogen.sh.
+ + Do not apply dconf-fix-dbus-introspection-enumeration.patch
+   which is already in git.
+ + Enforce gtk-doc html generation by passing --enable-gtk-doc to
+   configure.
+- Remove --disable-static from configure: it's not needed for dconf
+  which has an unusual setup.
+
+-------------------------------------------------------------------
+Fri Jan  7 17:47:04 CET 2011 - vuntz@opensuse.org
+
+- Update to version 0.6:
+  + Rewrite a lot of the GSettings backend to reduce GDBus abuse.
+    We use our own worker thread now instead of trying to hijack
+    GDBus's.
+  + Disable gobject-introspection support for now.
+  + Drop support for GTK2 in dconf-editor.
+  + Add a new torture-test case.
+  + Increase dbus timeout to 2 minutes (in case the service is
+    heavily loaded).
+  + Fix several memory leaks and other bugs.
+- Change pkgconfig(gtk+-2.0) BuildRequires to pkgconfig(gtk+-3.0).
+- Change vala-devel BuildRequires to vala-unstable-devel, following
+  an upstream commit after the release that recommends the use of
+  vala 0.11.
+- Add dconf-fix-dbus-introspection-enumeration.patch to fix dbus
+  introspection enumeration; taken from git.
+- Add Url tag.
+
 -------------------------------------------------------------------
 Wed Dec 15 12:18:00 CET 2010 - vuntz@opensuse.org
 

dconf.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package dconf (Version 0.5.1)
+# spec file for package dconf (Version 0.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,21 +18,28 @@
 
 
 Name:           dconf
-Version:        0.5.1
+Version:        0.6
-Release:        3
+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
 License:        LGPLv2.1+
 Summary:        Simple key-based configuration system
 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-devel
+BuildRequires:  vala-unstable-devel
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libxml-2.0)
+%if 0%{?BUILD_FROM_VCS}
+BuildRequires:  gtk-doc
+%endif
 # 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
@@ -98,11 +105,21 @@ have configuration storage systems.
 
 %prep
 %setup -q
+%if !0%{?BUILD_FROM_VCS}
+%patch0 -p1
+%endif
+
+%if 0%{?BUILD_FROM_VCS}
+NOCONFIGURE=1 ./autogen.sh
+%endif
 
 %build
 export SUSE_ASNEEDED=0
 %configure \
-    --disable-static
+%if 0%{?BUILD_FROM_VCS}
+    --enable-gtk-doc
+%endif
+
 %__make %{?_smp_mflags}
 
 %install
@@ -132,7 +149,6 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 %files -n libdconf0
 %defattr(-, root, root)
 %{_libdir}/libdconf.so.*
-%{_libdir}/girepository-1.0/dconf-1.0.typelib
 
 %files -n gsettings-backend-dconf
 %defattr(-, root, root)
@@ -148,7 +164,6 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 %{_includedir}/dconf/
 %{_libdir}/libdconf.so
 %{_libdir}/pkgconfig/dconf.pc
-%{_datadir}/gir-1.0/*.gir
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/dconf.*