rpms/dbus-glib/F-13 0001-Fix-lookup-of-regular-properties-when-shadow-propert.patch, NONE, 1.1 dbus-glib.spec, 1.46, 1.47

[Daniel Williams]

Author: dcbw

Update of /cvs/extras/rpms/dbus-glib/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7416

Modified Files:
	dbus-glib.spec 
Added Files:
	0001-Fix-lookup-of-regular-properties-when-shadow-propert.patch 
Log Message:
* Tue Jun 29 2010 Dan Williams <dcbw at redhat.com> - 0.86-3
- Fix shadow property access (fdo #28835)

* Tue Jun 29 2010 Bastien Nocera <bnocera at redhat.com> 0.86-2
- Add introspection data from gir-repository
- Remove unneeded autotools calls



0001-Fix-lookup-of-regular-properties-when-shadow-propert.patch:
 dbus-gobject.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Fix-lookup-of-regular-properties-when-shadow-propert.patch ---
>From b2c9478f9be1c8cf0d89a2391eb4da91b2940040 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw at redhat.com>
Date: Tue, 29 Jun 2010 21:19:25 -0700
Subject: [PATCH] Fix lookup of regular properties when shadow properties are used

Only free the uscore converted name if there's actually a shadow
property registered for this property; otherwise if there is no
shadow property we free the uscore converted one and then return
it immediately after.
---
 dbus/dbus-gobject.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
index 3344761..6a1aba4 100644
--- a/dbus/dbus-gobject.c
+++ b/dbus/dbus-gobject.c
@@ -945,7 +945,8 @@ lookup_property_name (GObject    *object,
   if (shadow_props)
     {
       shadow_prop_name = g_strdup (g_hash_table_lookup (shadow_props, wincaps_propname));
-      g_free (uscore_name);
+      if (shadow_prop_name)
+        g_free (uscore_name);
     }
 
   return shadow_prop_name ? shadow_prop_name : uscore_name;
-- 
1.7.0.1



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-glib/F-13/dbus-glib.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- dbus-glib.spec	25 Mar 2010 00:32:58 -0000	1.46
+++ dbus-glib.spec	30 Jun 2010 05:45:51 -0000	1.47
@@ -8,23 +8,26 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.86
-Release: 1%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 #VCS: git:git://git.freedesktop.org/git/dbus/dbus-glib
 Source0: http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
+Source1: http://git.gnome.org/browse/gir-repository/plain/gir/DBusGLib-1.0.gir
 License: AFL and GPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: chkconfig >= 1.3.26
+Requires: gobject-introspection
 BuildRequires: libtool
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gettext
-BuildRequires: autoconf
-# this patch requires autoreconf
-BuildRequires: autoconf automake libtool gettext-devel gtk-doc
+BuildRequires: gobject-introspection-devel
+
+# https://bugs.freedesktop.org/show_bug.cgi?id=28835
+Patch0: 0001-Fix-lookup-of-regular-properties-when-shadow-propert.patch
 
 %description
 
@@ -38,6 +41,7 @@ Requires: %name = %{version}-%{release}
 Requires: glib2-devel
 Requires: dbus-devel
 Requires: pkgconfig
+Requires: gobject-introspection-devel
 Obsoletes: dbus-devel < 0.90
 
 %description devel
@@ -58,11 +62,9 @@ D-Bus tools written using the gtk+ GUI l
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
-libtoolize --force --copy
-autoreconf
 %configure --disable-tests \
 	--enable-verbose-mode=yes \
 	--enable-asserts=yes \
@@ -77,6 +79,11 @@ rm -rf %{buildroot}
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# As gir-repository doesn't exist anymore, do this ourselves
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gir-1.0/DBusGLib-1.0.gir
+/usr/bin/g-ir-compiler --includedir=.  %{SOURCE1} -o DBusGLib-1.0.typelib
+install -D DBusGLib-1.0.typelib $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/DBusGLib-1.0.typelib
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -95,6 +102,7 @@ rm -rf %{buildroot}
 
 %{_libdir}/*glib*.so.*
 %{_bindir}/dbus-binding-tool
+%{_libdir}/girepository-1.0/DBusGLib-1.0.typelib
 
 %files devel
 %defattr(-,root,root)
@@ -106,6 +114,7 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 %{_sysconfdir}/bash_completion.d/dbus-bash-completion.sh
 %{_libexecdir}/dbus-bash-completion-helper
+%{_datadir}/gir-1.0/DBusGLib-1.0.gir
 
 %if 0
 %files gtk
@@ -116,6 +125,13 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Jun 29 2010 Dan Williams <dcbw at redhat.com> - 0.86-3
+- Fix shadow property access (fdo #28835)
+
+* Tue Jun 29 2010 Bastien Nocera <bnocera at redhat.com> 0.86-2
+- Add introspection data from gir-repository
+- Remove unneeded autotools calls
+
 * Thu Mar 18 2010 Colin Walters <walters at verbum.org> - 0.86-1
 - New upstream
   Drop upstreamed patch