From 8af9d9b71657e44b1be34aa01ebc92716b5580c1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 29 Jun 2010 14:38:22 +0000 Subject: [PATCH] - New upstream development release - Update to support building git snapshot directly --- .cvsignore | 2 +- gobject-introspection.spec | 23 ++++++++++++++--------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9a7f069..e06c95c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gobject-introspection-0.6.14.tar.bz2 +gobject-introspection-0.9.0.tar.gz diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 6babb0e..6fdb95b 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -2,27 +2,24 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gobject-introspection -Version: 0.6.14 -Release: 3%{?dist} +Version: 0.9.0 +Release: 1%{?dist} Summary: Introspection system for GObject-based libraries Group: Development/Libraries License: GPLv2+, LGPLv2+, MIT URL: http://live.gnome.org/GObjectIntrospection #VCS: git:git://git.gnome.org/gobject-introspection -Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.gz Obsoletes: gir-repository BuildRequires: glib2-devel BuildRequires: python-devel >= 2.5 BuildRequires: gettext -BuildRequires: intltool -BuildRequires: gtk-doc BuildRequires: flex BuildRequires: bison BuildRequires: libffi-devel -BuildRequires: chrpath BuildRequires: mesa-libGL-devel BuildRequires: cairo-devel BuildRequires: libxml2-devel @@ -31,6 +28,10 @@ BuildRequires: libX11-devel BuildRequires: fontconfig-devel BuildRequires: libXft-devel BuildRequires: freetype-devel +# Bootstrap requirements +BuildRequires: gnome-common +BuildRequires: intltool +BuildRequires: gtk-doc %description GObject Introspection can scan C header and source files in order to @@ -53,8 +54,9 @@ Libraries and headers for gobject-introspection %setup -q %build -%configure -make V=1 +(if ! test -x configure; then AUTOGEN_SUBDIR_MODE=1 NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; + %configure $CONFIGFLAGS) +make V=1 %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT @@ -62,7 +64,6 @@ make install DESTDIR=$RPM_BUILD_ROOT # Die libtool, die. find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/g-ir-{compiler,generate} %post -p /sbin/ldconfig @@ -91,6 +92,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/g-ir-{compiler,generate} %{_mandir}/man1/*.gz %changelog +* Tue Jun 29 2010 Colin Walters - 0.9.0-1 +- New upstream development release +- Update to support building git snapshot directly + * Thu Jun 24 2010 Colin Walters - 0.6.14-3 - rebuild to pick up new glib changes diff --git a/sources b/sources index f12f387..af3ebf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ea9be9a347b5c408fd3c3907803de9b gobject-introspection-0.6.14.tar.bz2 +de68d8382970ef9ce1ba77ee42de3907 gobject-introspection-0.9.0.tar.gz