[goocanvas2/f16] upstream 2.0.1

[Haïkel Guémar]

commit 098d7e41c56ba4ce485546130483645331571921
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Tue Oct 11 01:35:45 2011 +0200

    upstream 2.0.1

 .gitignore      |    1 +
 goocanvas2.spec |   29 +++++++++++++++--------------
 sources         |    2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d98df8..1854a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /goocanvas-1.90.2.tar.bz2
+/goocanvas-2.0.1.tar.bz2
diff --git a/goocanvas2.spec b/goocanvas2.spec
index 6d3bc73..58c21bc 100644
--- a/goocanvas2.spec
+++ b/goocanvas2.spec
@@ -2,7 +2,7 @@
 %global apiver  2.0
 
 Name:           goocanvas2
-Version:        1.90.2
+Version:        2.0.1
 Release:        1%{?dist}
 Summary:        A new canvas widget for GTK+ that uses cairo for drawing
 
@@ -10,15 +10,15 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/GooCanvas
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{tarname}/1.90/%{tarname}-%{version}.tar.bz2
-# GNOME BZ #642097 : fixes parallel installation with goocanvas
-# fixed in git
-Patch0:         goocanvas2-1.90.2-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext, pkgconfig
 BuildRequires:  autoconf, automake, libtool, gtk-doc
 BuildRequires:  gtk3-devel >= 2.91.3
 BuildRequires:  cairo-devel >= 1.4.0
+BuildRequires:  gobject-introspection-devel
+# For the girepository-1.0 directory
+Requires:       gobject-introspection
 
 %description
 GooCanvas is a new canvas widget for GTK+ that uses the cairo 2D library for
@@ -29,25 +29,22 @@ views, so you can easily turn any application object into canvas items.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?isa} = %{version}-%{release}
+Requires:       gobject-introspection-devel
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-
 %prep
 %setup -q -n %{tarname}-%{version}
-%patch0 -p1
-autoreconf -vif
-# TODO: fix demos to build against latest Gtk+
-sed -i -e 's/ demo / /g' Makefile.am
-sed -i -e 's/ demo / /g' Makefile.in
 
 
 %build
+# python GI wrapper is not enabled yet until i figure a proper way to package it
 %configure --disable-static \
-           --with-html-dir=%{_datadir}/gtk-doc/html/%{tarname}-%{apiver}
+           --with-html-dir=%{_datadir}/gtk-doc/html/%{tarname}-%{apiver} \
+           --enable-python=no
 make %{?_smp_mflags}
 
 
@@ -70,6 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING README ChangeLog AUTHORS NEWS TODO
 %{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/GooCanvas-2.0.typelib
 
 %files devel
 %defattr(-,root,root,-)
@@ -78,9 +76,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{tarname}-%{apiver}.pc
 %{_datadir}/gtk-doc/html/%{tarname}-%{apiver}
-
+%{_datadir}/gir-1.0/GooCanvas-2.0.gir
 
 %changelog
+* Mon Oct 10 2011 Haïkel Guémar <haikel.guemar at sysfera.com> - 2.0.1-1
+- upstream 2.0.1
+- remove upstreamed patch and enable GIR
+
 * Fri Feb 11 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 1.90.2-1
 - initial package
-
diff --git a/sources b/sources
index bb58ece..4618601 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73fd246626e92df32d00f047f3e0c4bb  goocanvas-1.90.2.tar.bz2
+97b7c82a44ea232ee3b08840c02da1bc  goocanvas-2.0.1.tar.bz2