rpms/gir-repository/F-13 gir-fixbabl.patch, NONE, 1.1 gir-repository.spec, 1.17, 1.18

[Peter Robinson]

Author: pbrobinson

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

Modified Files:
	gir-repository.spec 
Added Files:
	gir-fixbabl.patch 
Log Message:
- Add patch to fix babl version, Fix FTBFS - Fixes 564867, Drop gstreamer as it should be enabled in gst itself

gir-fixbabl.patch:
 Makefile.am |   10 +++++-----
 Makefile.in |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE gir-fixbabl.patch ---
--- gir-repository-0.6.5/gir/Makefile.in.orig	2010-03-03 16:30:38.000000000 +0000
+++ gir-repository-0.6.5/gir/Makefile.in	2010-03-03 16:51:50.000000000 +0000
@@ -86,7 +86,7 @@
 @BUILD_GSSDP_TRUE at am__append_33 = GSSDP-1.0.gir
 @BUILD_GUPNP_TRUE at am__append_34 = GUPnP-1.0.gir
 @BUILD_AVAHI_TRUE at am__append_35 = Avahi-0.6.gir
- at BUILD_BABL_TRUE@am__append_36 = Babl-0.0.gir
+ at BUILD_BABL_TRUE@am__append_36 = Babl-0.1.gir
 @BUILD_UNIQUE_TRUE at am__append_37 = Unique-1.0.gir
 @BUILD_NAUTILUS_TRUE at am__append_38 = Nautilus-1.0.gir
 @BUILD_WNCK_TRUE at am__append_39 = Wnck-1.0.gir
@@ -549,7 +549,7 @@
 @BUILD_GSSDP_TRUE at GSSDP_INCLUDEDIR = `pkg-config --variable=includedir gssdp-1.0`/gssdp-1.0
 @BUILD_GUPNP_TRUE at GUPNP_INCLUDEDIR = `pkg-config --variable=includedir gupnp-1.0`/gupnp-1.0
 @BUILD_AVAHI_TRUE at AVAHI_INCLUDEDIR = `pkg-config --variable=includedir avahi-gobject`/avahi-gobject
- at BUILD_BABL_TRUE@BABL_INCLUDEDIR = `pkg-config --variable=includedir babl`/babl-0.0
+ at BUILD_BABL_TRUE@BABL_INCLUDEDIR = `pkg-config --variable=includedir babl`/babl-0.1
 @BUILD_UNIQUE_TRUE at UNIQUE_INCLUDEDIR = `pkg-config --variable=includedir unique-1.0`/unique-1.0/unique
 @BUILD_NAUTILUS_TRUE at NAUTILUS_INCLUDEDIR = `pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension
 @BUILD_WNCK_TRUE at WNCK_INCLUDEDIR = `pkg-config --variable=includedir libwnck-1.0`/libwnck-1.0/libwnck
@@ -1529,11 +1529,11 @@
 @BUILD_AVAHI_TRUE@             --output $@ \
 @BUILD_AVAHI_TRUE@             --pkg avahi-gobject \
 @BUILD_AVAHI_TRUE@             $(AVAHI_INCLUDEDIR)/*.h
- at BUILD_BABL_TRUE@Babl-0.0.gir: $(INTROSPECTION_SCANNER)
- at BUILD_BABL_TRUE@	$(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=0.0 \
+ at BUILD_BABL_TRUE@Babl-0.1.gir: $(INTROSPECTION_SCANNER)
+ at BUILD_BABL_TRUE@	$(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=0.1 \
 @BUILD_BABL_TRUE@            --add-include-path=$(srcdir) --add-include-path=. \
 @BUILD_BABL_TRUE@	    --include=GObject-2.0 \
- at BUILD_BABL_TRUE@            --library=babl-0.0 \
+ at BUILD_BABL_TRUE@            --library=babl-0.1 \
 @BUILD_BABL_TRUE@	    --libtool="$(LIBTOOL)" \
 @BUILD_BABL_TRUE@            --output $@ \
 @BUILD_BABL_TRUE@            --pkg babl \
--- gir-repository-0.6.5/gir/Makefile.am.orig	2010-03-03 16:32:45.000000000 +0000
+++ gir-repository-0.6.5/gir/Makefile.am	2010-03-03 16:53:09.000000000 +0000
@@ -882,17 +882,17 @@
 endif BUILD_AVAHI
 
 if BUILD_BABL
-BABL_INCLUDEDIR=`pkg-config --variable=includedir babl`/babl-0.0
-Babl-0.0.gir: $(INTROSPECTION_SCANNER)
-	$(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=0.0 \
+BABL_INCLUDEDIR=`pkg-config --variable=includedir babl`/babl-0.1
+Babl-0.1.gir: $(INTROSPECTION_SCANNER)
+	$(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=0.1 \
             --add-include-path=$(srcdir) --add-include-path=. \
 	    --include=GObject-2.0 \
-            --library=babl-0.0 \
+            --library=babl-0.1 \
 	    --libtool="$(LIBTOOL)" \
             --output $@ \
             --pkg babl \
             $(BABL_INCLUDEDIR)/babl/*.h
-BUILT_GIRSOURCES += Babl-0.0.gir
+BUILT_GIRSOURCES += Babl-0.1.gir
 endif BUILD_BABL
 
 if BUILD_UNIQUE


Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/F-13/gir-repository.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gir-repository.spec	4 Jan 2010 14:19:02 -0000	1.17
+++ gir-repository.spec	3 Mar 2010 17:19:54 -0000	1.18
@@ -1,11 +1,12 @@
 Name:           gir-repository
 Version:        0.6.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Introspection for GNOME libraries
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/GObjectIntrospection
+#VCS:           git://git.gnome.org/gir-repository
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -17,7 +18,6 @@ BuildRequires:  gnome-keyring-devel
 BuildRequires:  gnome-menus-devel
 BuildRequires:  goocanvas-devel
 BuildRequires:  gssdp-devel
-BuildRequires:  gstreamer-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtksourceview2-devel
 BuildRequires:  gupnp-devel
@@ -32,6 +32,7 @@ BuildRequires:  WebKit-gtk-devel
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=604167
 Patch0:        gir-repo-install-dbus-glib.patch
+Patch1:        gir-fixbabl.patch
 BuildRequires: autoconf automake libtool gettext intltool
 
 %description
@@ -49,6 +50,7 @@ Libraries and headers for gir-repository
 %prep
 %setup -q
 %patch0 -p1 -b .dbus-glib
+%patch1 -p1 -b .fixbabl
 
 %build
 autoreconf
@@ -92,6 +94,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Wed Mar  3 2010 Peter Robinson <pbrobinson at gmail.com> 0.6.5-6
+- Add patch to fix babl version
+- Fix FTBFS - Fixes 564867
+- Drop gstreamer as it should be enabled in gst itself
+
 * Mon Jan  4 2010 Tomas Bzatek <tbzatek at redhat.com> 0.6.5-5
 - Drop gdk