rpms/gir-repository/F-12 gir-repo-install-dbus-glib.patch,1.1,1.2

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gir-repository/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18059

Modified Files:
	gir-repo-install-dbus-glib.patch 
Log Message:
fix dbus-glib gir file

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

Index: gir-repo-install-dbus-glib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/F-12/gir-repo-install-dbus-glib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gir-repo-install-dbus-glib.patch	9 Dec 2009 12:19:19 -0000	1.1
+++ gir-repo-install-dbus-glib.patch	9 Dec 2009 13:04:09 -0000	1.2
@@ -1,12 +1,3 @@
-commit 3a2480afdf768c46ac87500f9912c0a111851b86
-Author: Vincent Untz <vuntz at gnome.org>
-Date:   Thu Dec 3 13:41:37 2009 +0100
-
-    Install DBusGLib-1.0.gir if dbus build is enabled
-    
-    We do this instead of installing it only when mission-control build is
-    enabled (which is off by default).
-
 diff --git a/gir/Makefile.am b/gir/Makefile.am
 index b7ce585..5a362b8 100644
 --- a/gir/Makefile.am
@@ -30,14 +21,6 @@ index b7ce585..5a362b8 100644
  DBus-1.0.gir: libgirepo-DBus-custom.la
  	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \
  	    --add-include-path=$(srcdir) --add-include-path=. \
-commit fdf6cf0d5cab34f4a69deb0e9c86a853cc50e647
-Author: Dan Winship <danw at gnome.org>
-Date:   Mon Dec 7 15:51:15 2009 -0500
-
-    Move DBusGLib-1.0.gir from BUILT_GIRSOURCES to CUSTOM_GIRSOURCES
-    
-    fixes "make clean; make"
-
 diff --git a/gir/Makefile.am b/gir/Makefile.am
 index 5a362b8..40bb44b 100644
 --- a/gir/Makefile.am
@@ -51,3 +34,17 @@ index 5a362b8..40bb44b 100644
  
  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"/>