From 5fe24105165b01c34ecefb2fab693898ef7c8485 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@backtick.net>
Date: Mon, 15 Oct 2012 00:54:38 -0400
Subject: [PATCH] 7.30.3

---
 .gitignore |  2 +-
 sources    |  2 +-
 vips.spec  | 33 +++++++++++++++++++++++----------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7a71dc7..b511635 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/vips-7.28.2.tar.gz
+/vips-7.30.3.tar.gz
diff --git a/sources b/sources
index b28227b..88cd18a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a46826029a981ddbb31295dc56a7d4a  vips-7.28.2.tar.gz
+f59330e98b2ffeabb6b5fb92487b0280  vips-7.30.3.tar.gz
diff --git a/vips.spec b/vips.spec
index 9ff2362..4c9c947 100644
--- a/vips.spec
+++ b/vips.spec
@@ -1,16 +1,15 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Name:		vips
-Version:	7.28.2
-Release:	3%{?dist}
+Version:	7.30.3
+Release:	1%{?dist}
 Summary:	C/C++ library for processing large images
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://www.vips.ecs.soton.ac.uk/
-Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.28/%{name}-%{version}.tar.gz
+Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.30/%{name}-%{version}.tar.gz
 
 BuildRequires:	pkgconfig(glib-2.0)
+BuildRequires:	pkgconfig(gobject-introspection-1.0)
 BuildRequires:	pkgconfig(libxml-2.0)
 BuildRequires:	pkgconfig(fftw3)
 BuildRequires:	pkgconfig(MagickWand)
@@ -21,13 +20,17 @@ BuildRequires:	pkgconfig(matio)
 BuildRequires:	pkgconfig(cfitsio)
 BuildRequires:	pkgconfig(pangoft2)
 BuildRequires:	pkgconfig(libpng)
+BuildRequires:	pkgconfig(libtiff-4)
 BuildRequires:	pkgconfig(libexif)
 BuildRequires:	pkgconfig(openslide)
 
-BuildRequires:	libjpeg-devel libtiff-devel zlib-devel
+# Work around rhbz #866302 for OpenEXR
+BuildRequires:	libGL-devel libGLU-devel
+
+BuildRequires:	libjpeg-devel zlib-devel
 
 BuildRequires:	pkgconfig gettext
-BuildRequires:	libtool python-devel
+BuildRequires:	python-devel
 BuildRequires:	swig gtk-doc
 #Requires:
 
@@ -45,6 +48,7 @@ against VIPS.
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	libjpeg-devel%{?_isa} libtiff-devel%{?_isa} zlib-devel%{?_isa}
+Requires:	vips%{?_isa} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains the header files and
@@ -55,6 +59,7 @@ contains a C++ API and development man pages.
 %package tools
 Summary:	Command-line tools for %{name}
 Group:		Applications/Multimedia
+Requires:	vips%{?_isa} = %{version}-%{release}
 
 %description tools
 The %{name}-tools package contains command-line tools for working with VIPS.
@@ -63,6 +68,7 @@ The %{name}-tools package contains command-line tools for working with VIPS.
 %package python
 Summary:	Python support for %{name}
 Group:		Development/Languages
+Requires:	vips%{?_isa} = %{version}-%{release}
 
 %description python
 The %{name}-python package contains Python support for VIPS.
@@ -80,7 +86,6 @@ HTML and PDF formats.
 
 %prep
 %setup -q
-find . -name 'CVS' -type d -print0 | xargs -0 rm -rf
 
 # make the version string consistent for multiarch
 export FAKE_BUILD_DATE=$(date -r %{SOURCE0})
@@ -91,14 +96,14 @@ unset FAKE_BUILD_DATE
 
 %build
 %configure --disable-static --enable-gtk-doc
-make %{?_smp_mflags} LIBTOOL=libtool
+make %{?_smp_mflags}
 
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT \( -name '*.la' -o -name '*.a' \) -exec rm -f {} ';'
 
-# delete doc (we will get it later with %doc)
+# delete doc (we will get it later with %%doc)
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips
 
 # locale stuff
@@ -113,12 +118,14 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips
 %files -f vips7.lang
 %doc AUTHORS NEWS THANKS TODO COPYING ChangeLog
 %{_libdir}/*.so.*
+%{_libdir}/girepository-1.0
 
 
 %files devel
 %{_includedir}/vips
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
+%{_datadir}/gir-1.0
 %{_datadir}/gtk-doc
 
 
@@ -136,6 +143,12 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips
 
 
 %changelog
+* Mon Oct 15 2012 Benjamin Gilbert <bgilbert@backtick.net> - 7.30.3-1
+- New release
+- Enable gobject introspection
+- Add versioned dependency on base package
+- Minor specfile cleanups
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.28.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild