[packages/python3-pillow] - updated to 8.1.0 - updated subpackage patch

qboosh qboosh at pld-linux.org
Sat Feb 6 16:25:38 CET 2021


commit fad6cf98c51206e4b59bcd3b43172930436af233
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 6 16:25:59 2021 +0100

    - updated to 8.1.0
    - updated subpackage patch

 python3-pillow-subpackage.patch | 12 ++++++------
 python3-pillow.spec             | 34 ++++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 18 deletions(-)
---
diff --git a/python3-pillow.spec b/python3-pillow.spec
index c301c50..a304489 100644
--- a/python3-pillow.spec
+++ b/python3-pillow.spec
@@ -11,14 +11,14 @@
 Summary:	Python 3 image processing library
 Summary(pl.UTF-8):	Biblioteka do przetwarzania obrazów dla Pythona 3
 Name:		python3-%{module}
-Version:	7.0.0
+Version:	8.1.0
 Release:	1
 # License: see http://www.pythonware.com/products/pil/license.htm
 License:	MIT
 Group:		Libraries/Python
 #Source0Download: https://pypi.org/simple/pillow/
 Source0:	https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-%{version}.tar.gz
-# Source0-md5:	d099946335c1ba372f5b1fa68ca71645
+# Source0-md5:	9e3ab8e9b30993099ae9fee73ff92276
 Patch0:		%{name}-subpackage.patch
 Patch1:		x32.patch
 URL:		https://python-pillow.org/
@@ -28,21 +28,27 @@ BuildRequires:	lcms2-devel >= 2
 BuildRequires:	libimagequant-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libraqm-devel
-BuildRequires:	libtiff-devel
+BuildRequires:	libtiff-devel >= 4
 BuildRequires:	libwebp-devel
+BuildRequires:	libxcb-devel
 BuildRequires:	openjpeg2-devel >= 2
 BuildRequires:	pkgconfig
 BuildRequires:	python3-cffi
-BuildRequires:	python3-devel >= 1:3.5
+BuildRequires:	python3-devel >= 1:3.6
 BuildRequires:	python3-numpy
 BuildRequires:	python3-setuptools
 BuildRequires:	python3-tkinter
-BuildRequires:	rpmbuild(macros) >= 1.714
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	tk-devel
 BuildRequires:	zlib-devel
+%if %{with tests}
+BuildRequires:	python3-olefile
+%endif
 %if %{with doc}
+BuildRequires:	python3-sphinx_issues
+BuildRequires:	python3-sphinx_removed_in
 BuildRequires:	python3-sphinx_rtd_theme
-BuildRequires:	sphinx-pdg-3
+BuildRequires:	sphinx-pdg-3 >= 2.4
 %endif
 # For EpsImagePlugin.py
 Requires:	ghostscript
@@ -97,9 +103,7 @@ Summary:	Documentation for Pillow module
 Summary(pl.UTF-8):	Dokumentacja do modułu Pillow
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
-%if "%{_rpmversion}" >= "4.6"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description doc
 Documentation for Pillow module.
@@ -154,7 +158,13 @@ PYTHONPATH=$(pwd)/build-3/%{py3_libbuilddir} \
 cp -R $PWD/Tests $PWD/build-3/%py3_libbuilddir/Tests
 cp -R $PWD/selftest.py $PWD/build-3/%py3_libbuilddir/selftest.py
 cd build-3/%py3_libbuilddir
-PYTHONPATH=$PWD %{__python3} selftest.py
+PYTHONPATH=$PWD \
+%{__python3} selftest.py
+cd ../..
+# qt test crashes without DISPLAY
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+PYTHONPATH=$PWD/build-3/%py3_libbuilddir \
+%{__python3} -m pytest Tests -k 'not test_qt_image_qapplication'
 %endif
 
 %install
@@ -166,7 +176,7 @@ cp -p src/libImaging/*.h $RPM_BUILD_ROOT%{py3_incdir}/Imaging
 %py3_install
 
 # Fix non-standard-executable-perm
-chmod +x $RPM_BUILD_ROOT%{py3_sitedir}/PIL/*.so
+chmod 755 $RPM_BUILD_ROOT%{py3_sitedir}/PIL/*.so
 
 %if %{with tests}
 %{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/{Tests,selftest.py,__pycache__/selftest.*}
@@ -177,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.rst README.rst docs/COPYING
+%doc CHANGES.rst LICENSE README.md
 %dir %{py3_sitedir}/PIL
 %{py3_sitedir}/PIL/*.py
 %attr(755,root,root) %{py3_sitedir}/PIL/_imaging.cpython-*.so
diff --git a/python3-pillow-subpackage.patch b/python3-pillow-subpackage.patch
index c274912..d90bdbf 100644
--- a/python3-pillow-subpackage.patch
+++ b/python3-pillow-subpackage.patch
@@ -1,6 +1,6 @@
---- Pillow-7.0.0/src/PIL/__init__.py.orig	2020-01-16 21:24:20.388014146 +0100
-+++ Pillow-7.0.0/src/PIL/__init__.py	2020-01-17 05:31:07.749784296 +0100
-@@ -23,6 +23,13 @@
+--- Pillow-8.1.0/src/PIL/__init__.py.orig	2021-01-02 20:54:29.000000000 +0100
++++ Pillow-8.1.0/src/PIL/__init__.py	2021-02-06 16:05:42.826876555 +0100
+@@ -82,6 +82,13 @@
  del _version
  
  
@@ -14,7 +14,7 @@
  _plugins = [
      "BlpImagePlugin",
      "BmpImagePlugin",
-@@ -60,7 +67,6 @@
+@@ -119,7 +126,6 @@
      "PpmImagePlugin",
      "PsdImagePlugin",
      "SgiImagePlugin",
@@ -22,7 +22,7 @@
      "SunImagePlugin",
      "TgaImagePlugin",
      "TiffImagePlugin",
-@@ -69,7 +75,7 @@
+@@ -128,7 +134,7 @@
      "XbmImagePlugin",
      "XpmImagePlugin",
      "XVThumbImagePlugin",
@@ -30,4 +30,4 @@
 +] + _get_optional_plugins()
  
  
- class UnidentifiedImageError(IOError):
+ class UnidentifiedImageError(OSError):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3-pillow.git/commitdiff/fad6cf98c51206e4b59bcd3b43172930436af233



More information about the pld-cvs-commit mailing list