From 392c252e24e090a748db3451fb6eefc891b371bf Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 11 Mar 2010 20:52:49 +0000 Subject: [PATCH] - New upstream snapshot - rm unneeded rm --- gobject-introspection.spec | 24 +++++++++++++----------- sources | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 065379a..0b785d4 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -1,27 +1,29 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define alphatag 20100128git - Name: gobject-introspection Version: 0.6.8 -Release: 1.1.%{alphatag} +Release: 0.2.20100311git2cc97351 Summary: Introspection system for GObject-based libraries Group: Development/Libraries License: GPLv2+, LGPLv2+, MIT URL: http://live.gnome.org/GObjectIntrospection -#VCS: git://git.gnome.org/gobject-introspection +#VCS: git:git://git.gnome.org/gobject-introspection #Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.bz2 # git clone git://git.gnome.org/gobject-introspection # rm -fr gobject-introspection/.git # tar -cvzf gobject-introspection.tar.gz gobject-introspection/ -Source0: %{name}.tar.gz +Source0: gobject-introspection-0.6.8git2cc97351.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # git snapshot requires some other fun stuff BuildRequires: autoconf >= 2.53 +BuildRequires: libtool +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: gnome-common BuildRequires: automake >= 1.10 BuildRequires: gnome-common >= 2.2.0 BuildRequires: libtool >= 1.4.3 @@ -65,12 +67,10 @@ Libraries and headers for gobject-introspection #%setup -q # git snapshot has a different directory name: -%setup -q -n %{name} -# needed to build the git tree -/bin/sh autogen.sh +%setup -q -n gobject-introspection-0.6.8git2cc97351 %build -%configure +./autogen.sh && %configure make V=1 %install @@ -81,8 +81,6 @@ make install DESTDIR=$RPM_BUILD_ROOT 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} -# Mistake in upstream automake -rm -f $RPM_BUILD_ROOT/%{_bindir}/barapp # Move the python modules to the correct location mkdir -p $RPM_BUILD_ROOT/%{python_sitearch} @@ -116,6 +114,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/*.gz %changelog +* Thu Mar 11 2010 Colin Walters +- New upstream snapshot +- rm unneeded rm + * Tue Feb 23 2010 Colin Walters - devel pkg should require libffi-devel diff --git a/sources b/sources index fac7a9e..468d61b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6778fcac8612203bd50e61b15358c82c gobject-introspection.tar.gz +ea0106746d120cfc88d5eb67be9278a6 gobject-introspection-0.6.8git2cc97351.tar.bz2