rpms/gir-repository/devel gir-repo-install-dbus-glib.patch, NONE, 1.1 gir-repository.spec, 1.11, 1.12

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29586

Modified Files:
	gir-repository.spec 
Added Files:
	gir-repo-install-dbus-glib.patch 
Log Message:
* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.6.5-3
- Install the DBusGlib bindings


gir-repo-install-dbus-glib.patch:
 b/gir/DBusGLib-1.0.gir |    3 ++-
 b/gir/Makefile.am      |    5 +++--
 gir/DBusGLib-1.0.gir   |   10 ++++------
 gir/Makefile.am        |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE gir-repo-install-dbus-glib.patch ---
diff --git a/gir/Makefile.am b/gir/Makefile.am
index b7ce585..5a362b8 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -12,8 +12,7 @@ CUSTOM_GIRSOURCES += $(AVAHI_GIRSOURCES)
 endif
 EXTRA_DIST += $(AVAHI_GIRSOURCES)
 
-MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \
-			    TelepathyGLib.gir \
+MISSIONCONTROL_GIRSOURCES = TelepathyGLib.gir \
 			    LibTelepathy.gir
 if BUILD_MISSIONCONTROL
 CUSTOM_GIRSOURCES += $(MISSIONCONTROL_GIRSOURCES)
@@ -29,6 +28,8 @@ libgirepo_DBus_custom_la_SOURCES = 	\
 EXTRA_DIST += $(srcdir)/dbus.c $(srcdir)/dbus.h
 
 if BUILD_DBUS
+BUILT_GIRSOURCES += DBusGLib-1.0.gir
+
 DBus-1.0.gir: libgirepo-DBus-custom.la
 	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
diff --git a/gir/Makefile.am b/gir/Makefile.am
index 5a362b8..40bb44b 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -28,7 +28,7 @@ libgirepo_DBus_custom_la_SOURCES = 	\
 EXTRA_DIST += $(srcdir)/dbus.c $(srcdir)/dbus.h
 
 if BUILD_DBUS
-BUILT_GIRSOURCES += DBusGLib-1.0.gir
+CUSTOM_GIRSOURCES += DBusGLib-1.0.gir
 
 DBus-1.0.gir: libgirepo-DBus-custom.la
 	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \
diff --git a/gir/DBusGLib-1.0.gir b/gir/DBusGLib-1.0.gir
index d79a018..41d273a 100644
--- a/gir/DBusGLib-1.0.gir
+++ b/gir/DBusGLib-1.0.gir
@@ -3,7 +3,8 @@
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0"
 	    xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <include name="GObject"/>
+  <include name="GObject" version="2.0"/>
+  <package name="dbus-glib-1"/>
   <namespace name="DBusGLib" version="1.0" shared-library="dbus-glib-1">
     <record name="Connection" c:type="DBusGConnection"/>
     <record name="MethodInvocation" c:type="DBusGMethodInvocation"/>
commit 955452107bd87eecd5c5af3f6552c650fc49bdf2
Author: Colin Walters <walters at verbum.org>
Date:   Thu Oct 22 23:01:07 2009 -0400

    [DBusGLib] Add transfer-ownership

diff --git a/gir/DBusGLib-1.0.gir b/gir/DBusGLib-1.0.gir
index 41d273a..c50bfbb 100644
--- a/gir/DBusGLib-1.0.gir
+++ b/gir/DBusGLib-1.0.gir
@@ -12,16 +12,14 @@
       glib:type-name="DBusGProxy" glib:get-type="dbus_g_proxy_get_type">
     </class>
     <record name="ProxyClass" c:type="DBusGProxyClass"/>
-
-    <function name="connection_open" c:identifier="dbus_g_connection_open"
-     throws="1">
+    <function name="connection_open" c:identifier="dbus_g_connection_open" throws="1">
       <return-value transfer-ownership="full">
         <type name="Connection" c:type="DBusGConnection*"/>
       </return-value>
       <parameters>
-        <parameter name="address">
-	  <type name="utf8" c:type="char*"/>
-	</parameter>
+        <parameter name="address" transfer-ownership="none">
+	      <type name="utf8" c:type="char*"/>
+        </parameter>
       </parameters>
     </function>
   </namespace>


Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gir-repository.spec	9 Sep 2009 20:16:27 -0000	1.11
+++ gir-repository.spec	9 Dec 2009 13:51:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gir-repository
 Version:        0.6.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Introspection for GNOME libraries
 
 Group:          Development/Libraries
@@ -30,12 +30,9 @@ BuildRequires:  unique-devel
 BuildRequires:  vte-devel
 BuildRequires:  WebKit-gtk-devel
 
-# Add these for autoreconf due to gst patch
-BuildRequires: intltool
-BuildRequires: gettext
-BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
+# https://bugzilla.gnome.org/show_bug.cgi?id=604167
+Patch0:        gir-repo-install-dbus-glib.patch
+BuildRequires: autoconf automake libtool gettext intltool
 
 %description
 Introspection system for GNOME libraries; see the gobject-introspection package.
@@ -51,6 +48,7 @@ Libraries and headers for gir-repository
 
 %prep
 %setup -q
+%patch0 -p1 -b .dbus-glib
 
 %build
 autoreconf
@@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.6.5-3
+- Install the DBusGlib bindings
+
 * Wed Sep 09 2009 Colin Walters <walters at verbum.org> - 0.6.5-2
 - rebuilt