rpms/gir-repository/F-12 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/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6416

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/Makefile.am |    5 +++--
 gir/Makefile.am   |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE gir-repo-install-dbus-glib.patch ---
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
+++ 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=. \
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
+++ 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 \


Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/F-12/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 12:19:19 -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