From a686a7da36b7969e80c046f80684436288271b30 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Wed, 11 May 2011 17:40:06 +0200
Subject: [PATCH] Update to 0.7.5

---
 .gitignore               |  1 +
 dconf-editor-crash.patch | 15 --------------
 dconf.spec               | 44 ++++++++++++++++------------------------
 sources                  |  2 +-
 4 files changed, 20 insertions(+), 42 deletions(-)
 delete mode 100644 dconf-editor-crash.patch

diff --git a/.gitignore b/.gitignore
index c657200..66627f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ dconf-0.5.tar.bz2
 /dconf-0.7.2.tar.bz2
 /dconf-0.7.3.tar.bz2
 /dconf-0.7.4.tar.bz2
+/dconf-0.7.5.tar.bz2
diff --git a/dconf-editor-crash.patch b/dconf-editor-crash.patch
deleted file mode 100644
index a96b63c..0000000
--- a/dconf-editor-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up dconf-0.7.3/editor/dconf-schema.vala.crash dconf-0.7.3/editor/dconf-schema.vala
---- dconf-0.7.3/editor/dconf-schema.vala.crash	2011-04-06 14:57:43.277748785 -0400
-+++ dconf-0.7.3/editor/dconf-schema.vala	2011-04-06 14:58:41.160881491 -0400
-@@ -52,9 +52,9 @@ public class SchemaKey
-                 }
-             }
-             else if (child->name == "summary")
--                summary = child->children->content;
-+                summary = child->children == null ? "" : child->children->content;
-             else if (child->name == "description")
--                description = child->children->content;
-+                description = child->children == null ? "" : child->children->content;
-             else if (child->name == "range")
-                 range = new SchemaValueRange.from_xml(type, child);
-             else if (child->name == "choices")
diff --git a/dconf.spec b/dconf.spec
index 3123084..1f79525 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -2,7 +2,7 @@
 %define vala_version 0.11.7
 
 Name:           dconf
-Version:        0.7.4
+Version:        0.7.5
 Release:        1%{?dist}
 Summary:        A configuration system
 
@@ -12,23 +12,14 @@ URL:            http://live.gnome.org/dconf
 #VCS:           git:git://git.gnome.org/dconf
 Source0:        http://download.gnome.org/sources/dconf/0.7/dconf-%{version}.tar.bz2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=646220
-Patch0: dconf-editor-crash.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
-BuildRequires:  dbus-devel
-Requires:       dbus
-
 BuildRequires:  gtk3-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  dbus-devel
 BuildRequires:  vala-devel >= %{vala_version}
-BuildRequires:  libgee-devel
-# BuildRequires:  gobject-introspection-devel
-# Bootstrap requirements
-BuildRequires:  autoconf automake libtool
 BuildRequires:  gtk-doc
-BuildRequires:  vala
-BuildRequires:  gobject-introspection-devel >= 0.9.6
+
+Requires:       dbus
 
 %description
 dconf is a low-level configuration system. Its main purpose is to provide a
@@ -55,26 +46,27 @@ docnf-editor allows you to browse and modify dconf databases.
 
 %prep
 %setup -q
-%patch0 -p1 -b .editor-crash
 
 %build
-(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
- %configure $CONFIGFLAGS \
-	--disable-static \
-)
+%configure --disable-static
 make %{?_smp_mflags}
 
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
-
 %postun
+if [ $1 -eq 0 ] ; then
+  /sbin/ldconfig
+  gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
+
+%posttrans
 /sbin/ldconfig
 gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -86,10 +78,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_bindir}/dconf
 %{_libdir}/libdconf.so.*
 %{_libdir}/libdconf-dbus-1.so.*
-#%{_libdir}/girepository-1.0/dconf-1.0.typelib
 %dir %{_sysconfdir}/bash_completion.d
 %{_sysconfdir}/bash_completion.d/dconf-bash-completion.sh
-
+%{_datadir}/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml
 
 %files devel
 %defattr(-,root,root,-)
@@ -99,8 +90,6 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_includedir}/dconf-dbus-1
 %{_libdir}/libdconf-dbus-1.so
 %{_libdir}/pkgconfig/dconf-dbus-1.pc
-# temporarily disable introspection until we have a new-enough goi
-#%{_datadir}/gir-1.0/dconf-1.0.gir
 %{_datadir}/gtk-doc/html/dconf
 %{_datadir}/vala
 
@@ -112,6 +101,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_datadir}/dconf-editor/dconf-editor.ui
 
 %changelog
+* Wed May 11 2011 Tomas Bzatek <tbzatek@redhat.com> - 0.7.5-1
+- Update to 0.7.5
+
 * Fri May  6 2011 Matthias Clasen <mclasen@redhat.com> - 0.7.4-1
 - Update to 0.7.4
 
diff --git a/sources b/sources
index 7c08082..39d500b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20d74109ff72ae16fcca3f5adf3d6885  dconf-0.7.4.tar.bz2
+d784f8afca04473d194a72047595c28e  dconf-0.7.5.tar.bz2