[python-pillow] Update to 2.0.0 git snapshot
Sandro Mani
smani at fedoraproject.org
Tue Mar 19 00:11:50 UTC 2013
commit 9087d6fa43dc15afa4e202c849be7d1ba0116130
Author: Sandro Mani <manisandro at gmail.com>
Date: Tue Mar 19 01:13:14 2013 +0100
Update to 2.0.0 git snapshot
.gitignore | 1 +
python-pillow-archs.patch | 55 +++++++++++++++++++++++++-------------------
python-pillow.spec | 34 ++++++++++++++++++++++-----
sources | 2 +-
4 files changed, 60 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f6966b..f84a827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/python-imaging-Pillow-1.7.8-137-g7866759.tar.gz
+/python-imaging-Pillow-2.0.0-11-g2f4207c.tar.gz
diff --git a/python-pillow-archs.patch b/python-pillow-archs.patch
index 0b23e9c..465dadf 100644
--- a/python-pillow-archs.patch
+++ b/python-pillow-archs.patch
@@ -1,27 +1,34 @@
---- python-imaging-Pillow-7866759/setup.py.orig 2013-03-13 10:57:49.090756034 +0000
-+++ python-imaging-Pillow-7866759/setup.py 2013-03-13 21:32:11.859488252 +0000
-@@ -137,6 +137,24 @@
- _add_directory(library_dirs, "/usr/lib/x86_64-linux-gnu")
- elif platform_ in ["i386", "i686", "32bit"]:
- _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
-+ elif platform_ in ["aarch64", "64bit"]:
-+ _add_directory(library_dirs, "/lib64")
-+ _add_directory(library_dirs, "/usr/lib64")
-+ _add_directory(library_dirs, "/usr/lib/aarch64-linux-gnu")
-+ elif platform_ in ["arm", "armv7l", "32bit"]:
-+ _add_directory(library_dirs, "/usr/lib/arm-linux-gnueabi")
-+ elif platform_ in ["ppc64", "64bit"]:
-+ _add_directory(library_dirs, "/lib64")
-+ _add_directory(library_dirs, "/usr/lib64")
-+ _add_directory(library_dirs, "/usr/lib/ppc64-linux-gnu")
-+ elif platform_ in ["ppc", "32bit"]:
-+ _add_directory(library_dirs, "/usr/lib/ppc-linux-gnu")
-+ elif platform_ in ["s390x", "64bit"]:
-+ _add_directory(library_dirs, "/lib64")
-+ _add_directory(library_dirs, "/usr/lib64")
-+ _add_directory(library_dirs, "/usr/lib/s390x-linux-gnu")
-+ elif platform_ in ["s390", "32bit"]:
-+ _add_directory(library_dirs, "/usr/lib/s390-linux-gnu")
+diff -rupN python-imaging-Pillow-2f4207c/setup.py python-imaging-Pillow-2f4207c-new/setup.py
+--- python-imaging-Pillow-2f4207c/setup.py 2013-03-18 22:22:00.000000000 +0100
++++ python-imaging-Pillow-2f4207c-new/setup.py 2013-03-19 00:58:58.629486821 +0100
+@@ -138,6 +138,30 @@ class pil_build_ext(build_ext):
+ elif platform_ in ["i386", "i686", "32bit"]:
+ _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
+ break
++ elif platform_ in ["aarch64", "64bit"]:
++ _add_directory(library_dirs, "/lib64")
++ _add_directory(library_dirs, "/usr/lib64")
++ _add_directory(library_dirs, "/usr/lib/aarch64-linux-gnu")
++ break
++ elif platform_ in ["arm", "armv7l", "32bit"]:
++ _add_directory(library_dirs, "/usr/lib/arm-linux-gnueabi")
++ break
++ elif platform_ in ["ppc64", "64bit"]:
++ _add_directory(library_dirs, "/lib64")
++ _add_directory(library_dirs, "/usr/lib64")
++ _add_directory(library_dirs, "/usr/lib/ppc64-linux-gnu")
++ break
++ elif platform_ in ["ppc", "32bit"]:
++ _add_directory(library_dirs, "/usr/lib/ppc-linux-gnu")
++ break
++ elif platform_ in ["s390x", "64bit"]:
++ _add_directory(library_dirs, "/lib64")
++ _add_directory(library_dirs, "/usr/lib64")
++ _add_directory(library_dirs, "/usr/lib/s390x-linux-gnu")
++ break
++ elif platform_ in ["s390", "32bit"]:
++ _add_directory(library_dirs, "/usr/lib/s390-linux-gnu")
++ break
else:
raise ValueError("Unable to identify Linux platform: `%s`" % platform_)
diff --git a/python-pillow.spec b/python-pillow.spec
index 344965d..162fafb 100644
--- a/python-pillow.spec
+++ b/python-pillow.spec
@@ -2,17 +2,22 @@
%global py3_incdir %{_includedir}/python%{python3_version}
%global name3 python3-pillow
-%global with_python3 0
+%global with_python3 1
# Refer to the comment for Source0 below on how to obtain the source tarball
# The saved file has format python-imaging-Pillow-$version-$ahead-g$shortcommit.tar.gz
-%global commit 78667598270a78dc9eb4cf05c85d09f39be2e394
+%global commit 2f4207c0d75150f9009fe23e9134eea34b893518
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global ahead 137
+%global ahead 11
+
+# If ahead is 0, the tarball corresponds to a release version, otherwise to a git snapshot
+%if %{ahead} > 0
+%global snap .git%{shortcommit}
+%endif
Name: python-pillow
-Version: 1.7.8
-Release: 6.20130305git%{shortcommit}%{?dist}
+Version: 2.0.0
+Release: 1%{?snap}%{?dist}
Summary: Python 2 image processing library
# License: see http://www.pythonware.com/products/pil/license.htm
@@ -25,6 +30,8 @@ Source0: https://github.com/python-imaging/Pillow/tarball/%{commit}/pytho
# Add s390* and ppc* archs
Patch0: python-pillow-archs.patch
+# Comment out a particular test which hangs due to a gcc4.8 regression
+Patch1: python-pillow-disable-test.patch
BuildRequires: python2-devel
BuildRequires: python-setuptools
@@ -36,6 +43,7 @@ BuildRequires: zlib-devel
BuildRequires: freetype-devel
BuildRequires: lcms-devel
BuildRequires: sane-backends-devel
+BuildRequires: libwebp-devel
%if %{with_python3}
BuildRequires: python3-devel
@@ -159,6 +167,7 @@ Tk interface for %{name3}.
%prep
%setup -q -n python-imaging-Pillow-%{shortcommit}
%patch0 -p1 -b .archs
+%patch1 -p1 -b .test
%if %{with_python3}
# Create Python 3 source tree
@@ -229,29 +238,35 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}
%check
# Check Python 2 modules
ln -s $PWD/Images $RPM_BUILD_ROOT%{python_sitearch}/Images
+ln -s $PWD/Tests $RPM_BUILD_ROOT%{python_sitearch}/Tests
ln -s $PWD/selftest.py $RPM_BUILD_ROOT%{python_sitearch}/selftest.py
pushd $RPM_BUILD_ROOT%{python_sitearch}
%{__python} selftest.py
+%{__python} Tests/run.py
popd
rm $RPM_BUILD_ROOT%{python_sitearch}/Images
+rm $RPM_BUILD_ROOT%{python_sitearch}/Tests
rm $RPM_BUILD_ROOT%{python_sitearch}/selftest.py*
%if %{with_python3}
# Check Python 3 modules
pushd %{py3dir}
ln -s $PWD/Images $RPM_BUILD_ROOT%{python3_sitearch}/Images
+ln -s $PWD/Tests $RPM_BUILD_ROOT%{python3_sitearch}/Tests
ln -s $PWD/selftest.py $RPM_BUILD_ROOT%{python3_sitearch}/selftest.py
pushd $RPM_BUILD_ROOT%{python3_sitearch}
%{__python3} selftest.py
+%{__python3} Tests/run.py
popd
rm $RPM_BUILD_ROOT%{python3_sitearch}/Images
+rm $RPM_BUILD_ROOT%{python3_sitearch}/Tests
rm $RPM_BUILD_ROOT%{python3_sitearch}/selftest.py*
popd
%endif
%files
-%doc README.rst docs/CHANGES docs/HISTORY.txt COPYING
+%doc README.rst docs/HISTORY.txt COPYING
%{python_sitearch}/*
%exclude %{python_sitearch}/*sane*
%exclude %{python_sitearch}/_imagingtk*
@@ -275,7 +290,7 @@ popd
%if %{with_python3}
%files -n %{name3}
-%doc README.rst docs/CHANGES docs/HISTORY.txt COPYING
+%doc README.rst docs/HISTORY.txt COPYING
%{python3_sitearch}/*
%exclude %{python3_sitearch}/*sane*
%exclude %{python3_sitearch}/_imagingtk*
@@ -299,6 +314,11 @@ popd
%endif
%changelog
+* Tue Mar 19 2013 Sandro Mani <manisandro at gmail.com> - 2.0.0-1.git2f4207c
+- Update to 2.0.0 git snapshot
+- Enable python3 packages
+- Add libwebp-devel BR for Pillow 2.0.0
+
* Wed Mar 13 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.7.8-6.20130305git
- Add ARM support
diff --git a/sources b/sources
index 0ac326e..4870cbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10b92e21093ae0cc4beb82c678c5b26b python-imaging-Pillow-1.7.8-137-g7866759.tar.gz
+2aa70bf34aaa01ad9680dd22fe028f16 python-imaging-Pillow-2.0.0-11-g2f4207c.tar.gz
More information about the scm-commits
mailing list