From 2157cc0ad25a2342f2d35c8fb1d01d9f39519b42 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Aug 12 2010 15:19:18 +0000
Subject: - New upstream version

- drop now-merged shadow props patch

---

diff --git a/.gitignore b/.gitignore
index 1ee6eed..1dd5b2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 dbus-glib-0.84.tar.gz
 DBusGLib-1.0.gir
+dbus-glib-0.88.tar.gz
diff --git a/0001-Fix-lookup-of-regular-properties-when-shadow-propert.patch b/0001-Fix-lookup-of-regular-properties-when-shadow-propert.patch
deleted file mode 100644
index cc63918..0000000
--- a/0001-Fix-lookup-of-regular-properties-when-shadow-propert.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b2c9478f9be1c8cf0d89a2391eb4da91b2940040 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@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
-
diff --git a/dbus-glib.spec b/dbus-glib.spec
index 055dd7f..61a32e3 100644
--- a/dbus-glib.spec
+++ b/dbus-glib.spec
@@ -7,8 +7,8 @@
 
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
-Version: 0.86
-Release: 4%{?dist}
+Version: 0.88
+Release: 1%{?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
@@ -26,9 +26,6 @@ BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gettext
 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
 
 D-Bus add-on library to integrate the standard D-Bus library with
@@ -62,7 +59,6 @@ D-Bus tools written using the gtk+ GUI libaries
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-tests \
@@ -125,6 +121,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Aug 12 2010 Colin Walters <walters@verbum.org> - 0.88-1
+- New upstream version
+- drop now-merged shadow props patch
+
 * Mon Jul 12 2010 Colin Walters <walters@verbum.org> - 0.86-4
 - Rebuild against new gobject-introspection
 
diff --git a/sources b/sources
index a77f022..edfe61c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-cd0ab148fb0c786fc88be49d19971f50  dbus-glib-0.86.tar.gz
-8cde00153da26d1283957e95146551d4  DBusGLib-1.0.gir
+7c04ba01df6130c2c4e62f73bea0d0d5  dbus-glib-0.88.tar.gz