From a1c7681de80d3632e7b855faf1e8d3171a4d1b60 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@backtick.net>
Date: Sun, 28 Dec 2014 18:45:13 -0500
Subject: [PATCH] 7.42.1

---
 .gitignore |  1 +
 sources    |  2 +-
 vips.spec  | 64 +++++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 68d5bb0..d7fc028 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /vips-7.32.4.tar.gz
 /vips-7.36.5.tar.gz
 /vips-7.40.11.tar.gz
+/vips-7.42.1.tar.gz
diff --git a/sources b/sources
index e2dd5f0..c09e927 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38f2e366172a2afb17463e71584a5117  vips-7.40.11.tar.gz
+33a4590924b3120ce309982ec85a7c16  vips-7.42.1.tar.gz
diff --git a/vips.spec b/vips.spec
index 6b7120c..cac21a4 100644
--- a/vips.spec
+++ b/vips.spec
@@ -1,10 +1,12 @@
-%global vips_version_base 7.40
-%global vips_version %{vips_version_base}.11
-%global vips_soname_major 38
+%global vips_version_base 7.42
+%global vips_version %{vips_version_base}.1
+%global vips_soname_major 40
+
+%global with_python3 1
 
 Name:		vips
 Version:	%{vips_version}
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	C/C++ library for processing large images
 
 Group:		System Environment/Libraries
@@ -14,6 +16,7 @@ Source0:	http://www.vips.ecs.soton.ac.uk/supported/%{vips_version_base}/%{name}-
 
 BuildRequires:	pkgconfig(glib-2.0)
 BuildRequires:	pkgconfig(gobject-introspection-1.0)
+BuildRequires:	pkgconfig(pygobject-3.0)
 BuildRequires:	pkgconfig(libxml-2.0)
 BuildRequires:	pkgconfig(fftw3)
 BuildRequires:	pkgconfig(MagickWand)
@@ -34,8 +37,13 @@ BuildRequires:	pkgconfig(libgsf-1)
 BuildRequires:	libjpeg-turbo-devel
 
 BuildRequires:	pkgconfig gettext
-BuildRequires:	python-devel
+BuildRequires:	python2-devel
 BuildRequires:	swig gtk-doc
+
+%if 0%{?with_python3}
+BuildRequires:	python3-devel
+%endif
+
 #Requires:
 
 
@@ -70,12 +78,25 @@ The %{name}-tools package contains command-line tools for working with VIPS.
 
 
 %package python
-Summary:	Python support for %{name}
+Summary:	Python 2 support for %{name}
 Group:		Development/Languages
 Requires:	vips%{?_isa} = %{version}-%{release}
+Requires:	pygobject3-base >= 3.12.0
 
 %description python
-The %{name}-python package contains Python support for VIPS.
+The %{name}-python package contains Python 2 support for VIPS.
+
+
+%if 0%{?with_python3}
+%package python3
+Summary:	Python 3 support for %{name}
+Group:		Development/Languages
+Requires:	vips%{?_isa} = %{version}-%{release}
+Requires:	python3-gobject >= 3.12.0
+
+%description python3
+The %{name}-python3 package contains Python 3 support for VIPS.
+%endif
 
 
 %package doc
@@ -103,6 +124,10 @@ sed -i 's|sys_lib_dlsearch_path_spec="|sys_lib_dlsearch_path_spec="/%{_lib} %{_l
 
 
 %build
+# Upstream recommends enabling auto-vectorization of inner loops:
+# https://github.com/jcupitt/libvips/pull/212#issuecomment-68177930
+export CFLAGS="%{optflags} -ftree-vectorize"
+export CXXFLAGS="%{optflags} -ftree-vectorize"
 %configure --disable-static --enable-gtk-doc
 make %{?_smp_mflags}
 
@@ -117,6 +142,16 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips
 # locale stuff
 %find_lang vips%{vips_version_base}
 
+# Upstream supports the GI override module on Python 3, but doesn't install
+# it into the Python 3 path
+%if 0%{?with_python3}
+mkdir -p ${RPM_BUILD_ROOT}%{python3_sitearch}
+cp -a ${RPM_BUILD_ROOT}%{python2_sitearch}/gi \
+	${RPM_BUILD_ROOT}%{python3_sitearch}
+find ${RPM_BUILD_ROOT}%{python3_sitearch} \
+	\( -name '*.pyc' -o -name '*.pyo' \) -delete
+%endif
+
 
 %post -p /sbin/ldconfig
 
@@ -143,7 +178,15 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips
 
 
 %files python
-%{python_sitearch}/*
+%{python2_sitearch}/gi/overrides/*
+%{python2_sitearch}/vipsCC/
+
+
+%if 0%{?with_python3}
+%files python3
+%{python3_sitearch}/gi/overrides/*.py
+%{python3_sitearch}/gi/overrides/__pycache__/*
+%endif
 
 
 %files doc
@@ -151,6 +194,11 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips
 
 
 %changelog
+* Sun Dec 28 2014 Benjamin Gilbert <bgilbert@backtick.net> - 7.42.1-1
+- New release
+- Package new Python bindings
+- Build with auto-vectorization
+
 * Tue Nov 25 2014 Rex Dieter <rdieter@fedoraproject.org> 7.40.11-2
 - rebuild (openexr)