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..ef269b0 100644 --- a/goocanvas2.spec +++ b/goocanvas2.spec @@ -1,8 +1,10 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + %global tarname goocanvas %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,9 +12,6 @@ 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 @@ -29,25 +28,21 @@ 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} %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} @@ -78,9 +73,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %{_libdir}/pkgconfig/%{tarname}-%{apiver}.pc %{_datadir}/gtk-doc/html/%{tarname}-%{apiver} - +%{_libdir}/girepository-1.0/GooCanvas-2.0.typelib +%{_datadir}/gir-1.0/GooCanvas-2.0.gir %changelog +* Mon Oct 10 2011 Haïkel Guémar - 2.0.1-1 +- upstream 2.0.1 +- remove upstreamed patch and enable GIR + * Fri Feb 11 2011 Haïkel Guémar - 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