From bdeb50b5faafc13baa6853e275792f19ff12e3194bb4787310bf4046a4c6d265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 25 Oct 2024 15:33:55 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-Pillow revision b7e7027c44503b943678075212b0983e --- Pillow-10.0.1.tar.gz | 3 - pillow-10.4.0.tar.gz | 3 + python-Pillow.changes | 340 ++++++++++++++++++++++++++++++++++++------ python-Pillow.spec | 31 ++-- 4 files changed, 309 insertions(+), 68 deletions(-) delete mode 100644 Pillow-10.0.1.tar.gz create mode 100644 pillow-10.4.0.tar.gz diff --git a/Pillow-10.0.1.tar.gz b/Pillow-10.0.1.tar.gz deleted file mode 100644 index 5b197ae..0000000 --- a/Pillow-10.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d72967b06be9300fed5cfbc8b5bafceec48bf7cdc7dab66b1d2549035287191d -size 50528551 diff --git a/pillow-10.4.0.tar.gz b/pillow-10.4.0.tar.gz new file mode 100644 index 0000000..2e82d44 --- /dev/null +++ b/pillow-10.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:166c1cd4d24309b30d61f79f4a9114b7b2313d7450912277855ff5dfd7cd4a06 +size 46555059 diff --git a/python-Pillow.changes b/python-Pillow.changes index 862f8c9..756c471 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,3 +1,257 @@ +------------------------------------------------------------------- +Mon Jul 22 12:21:56 UTC 2024 - John Paul Adrian Glaubitz + +- Update to 10.4.0 + * Raise FileNotFoundError if show_file() path does not exist #8178 + [radarhere] + * Improved reading 16-bit TGA images with colour #7965 + [Yay295, radarhere] + * Deprecate non-image ImageCms modes #8031 + [radarhere] + * Fixed processing multiple JPEG EXIF markers #8127 + [radarhere] + * Do not preserve EXIFIFD tag by default when saving TIFF images #8110 + [radarhere] + * Added ImageFont.load_default_imagefont() #8086 + [radarhere] + * Added Image.WARN_POSSIBLE_FORMATS #8063 + [radarhere] + * Remove zero-byte end padding when parsing any XMP data #8171 + [radarhere] + * Do not detect Ultra HDR images as MPO #8056 + [radarhere] + * Raise SyntaxError specific to JP2 #8146 + [Yay295, radarhere] + * Do not use first frame duration for other frames when saving APNG images #8104 + [radarhere] + * Consider I;16 pixel size when using a 1 mode mask #8112 + [radarhere] + * When saving multiple PNG frames, convert to mode rather than raw mode #8087 + [radarhere] + * Added byte support to FreeTypeFont #8141 + [radarhere] + * Allow float center for rotate operations #8114 + [radarhere] + * Do not read layers immediately when opening PSD images #8039 + [radarhere] + * Restore original thread state #8065 + [radarhere] + * Read IM and TIFF images as RGB, rather than RGBX #7997 + [radarhere] + * Only preserve TIFF IPTC_NAA_CHUNK tag if type is BYTE or UNDEFINED #7948 + [radarhere] + * Clarify ImageDraw2 error message when size is missing #8165 + [radarhere] + * Support unpacking more rawmodes to RGBA palettes #7966 + [radarhere] + * Removed support for Qt 5 #8159 + [radarhere] + * Improve ``ImageFont.freetype`` support for XDG directories on Linux #8135 + [mamg22, radarhere] + * Improved consistency of XMP handling #8069 + [radarhere] + * Use pkg-config to help find libwebp and raqm #8142 + [radarhere] + * Accept 't' suffix for libtiff version #8126, #8129 + [radarhere] + * Deprecate ImageDraw.getdraw hints parameter #8124 + [radarhere, hugovk] + * Added ImageDraw circle() #8085 + [void4, hugovk, radarhere] + * Add mypy target to Makefile #8077 + [Yay295] + * Added more modes to Image.MODES #7984 + [radarhere] + * Deprecate BGR;15, BGR;16 and BGR;24 modes #7978 + [radarhere, hugovk] + * Fix ImagingAccess for I;16N on big-endian #7921 + [Yay295, radarhere] + * Support reading P mode TIFF images with padding #7996 + [radarhere] + * Deprecate support for libtiff < 4 #7998 + [radarhere, hugovk] + * Corrected ImageShow UnixViewer command #7987 + [radarhere] + * Use functools.cached_property in ImageStat #7952 + [nulano, hugovk, radarhere] + * Add support for reading BITMAPV2INFOHEADER and BITMAPV3INFOHEADER #7956 + [Cirras, radarhere] + * Support reading CMYK JPEG2000 images #7947 + [radarhere] + +------------------------------------------------------------------- +Wed Apr 10 12:07:32 UTC 2024 - Daniel Garcia + +- Reenable tests for s390x and ppc, bsc#1222553 + gh#python-pillow/Pillow#1204 + +------------------------------------------------------------------- +Wed Apr 3 07:29:31 UTC 2024 - Dirk Müller + +- update to 10.3.0 (bsc#1222262, CVE-2024-28219): + * CVE-2024-28219: Use strncpy to avoid buffer overflow #7928 + [radarhere, hugovk] + * Deprecate eval(), replacing it with lambda_eval() and + unsafe_eval() #7927 [radarhere, hugovk] + * Raise ValueError if seeking to greater than offset-sized + integer in TIFF #7883 [radarhere] + * Add --report argument to __main__.py to omit supported + formats #7818 [nulano, radarhere, hugovk] + * Added RGB to I;16, I;16L, I;16B and I;16N conversion #7918, + #7920 [radarhere] + * Fix editable installation with custom build backend and + configuration options #7658 [nulano, radarhere] + * Fix putdata() for I;16N on big-endian #7209 [Yay295, hugovk, + radarhere] + * Determine MPO size from markers, not EXIF data #7884 + [radarhere] + * Improved conversion from RGB to RGBa, LA and La #7888 + [radarhere] + * Support FITS images with GZIP_1 compression #7894 [radarhere] + * Use I;16 mode for 9-bit JPEG 2000 images #7900 [scaramallion, + radarhere] + * Raise ValueError if kmeans is negative #7891 [radarhere] + * Remove TIFF tag OSUBFILETYPE when saving using libtiff #7893 + [radarhere] + * Raise ValueError for negative values when loading P1-P3 PPM + images #7882 [radarhere] + * Added reading of JPEG2000 palettes #7870 [radarhere] + * Added alpha_quality argument when saving WebP images #7872 + [radarhere] + * Fixed joined corners for ImageDraw rounded_rectangle() non- + integer dimensions #7881 [radarhere] + * Stop reading EPS image at EOF marker #7753 [radarhere] + * PSD layer co-ordinates may be negative #7706 [radarhere] + * Use subprocess with CREATE_NO_WINDOW flag in ImageShow + WindowsViewer #7791 [radarhere] + * When saving GIF frame that restores to background color, do + not fill identical pixels #7788 [radarhere] + * Fixed reading PNG iCCP compression method #7823 [radarhere] + * Allow writing IFDRational to UNDEFINED tag #7840 [radarhere] + * Fix logged tag name when loading Exif data #7842 [radarhere] + * Use maximum frame size in IHDR chunk when saving APNG images + #7821 [radarhere] + * Prevent opening P TGA images without a palette #7797 + [radarhere] + * Use palette when loading ICO images #7798 [radarhere] + * Use consistent arguments for load_read and load_seek #7713 + [radarhere] + * Turn off nullability warnings for macOS SDK #7827 [radarhere] + * Fix shift-sign issue in Convert.c #7838 [r-barnes, radarhere] + * Open 16-bit grayscale PNGs as I;16 #7849 [radarhere] + * Handle truncated chunks at the end of PNG images #7709 + [lajiyuan, radarhere] + * Match mask size to pasted image size in GifImagePlugin #7779 + [radarhere] + * Release GIL while calling WebPAnimDecoderGetNext #7782 + [evanmiller, radarhere] + * Fixed reading FLI/FLC images with a prefix chunk #7804 + [twolife] + * Update wl-paste handling and return None for some errors in + grabclipboard() on Linux #7745 [nik012003, radarhere] + * Remove execute bit from setup.py #7760 [hugovk] + * Do not support using test-image-results to upload images + after test failures #7739 [radarhere] + * Changed ImageMath.ops to be static #7721 [radarhere] + * Fix APNG info after seeking backwards more than twice #7701 + [esoma, radarhere] + * Deprecate ImageCms constants and versions() function #7702 + [nulano, radarhere] + * Added PerspectiveTransform #7699 [radarhere] + * Add support for reading and writing grayscale PFM images + #7696 [nulano, hugovk] + * Add LCMS2 flags to ImageCms #7676 [nulano, radarhere, hugovk] + * Rename x64 to AMD64 in winbuild #7693 [nulano] + +------------------------------------------------------------------- +Mon Jan 22 06:00:50 UTC 2024 - Steve Kowalik + +- Update to 10.2.0: + * Add ``keep_rgb`` option when saving JPEG to prevent conversion of + RGB colorspace + * Trim glyph size in ImageFont.getmask() + * Deprecate IptcImagePlugin helpers + * Allow uncompressed TIFF images to be saved in chunks + * Concatenate multiple JPEG EXIF markers + * Changed IPTC tile tuple to match other plugins + * Do not assign new fp attribute when exiting context manager + * Support arbitrary masks for uncompressed RGB DDS images + * Support setting ROWSPERSTRIP tag + * Apply ImageFont.MAX_STRING_LENGTH to ImageFont.getmask() + * Optimise ``ImageColor`` using ``functools.lru_cache`` + * Restricted environment keys for ImageMath.eval() + (CVE-2023-50447, bsc#1219048) + * Optimise ``ImageMode.getmode`` using ``functools.lru_cache`` + * Fix incorrect color blending for overlapping glyphs + * Attempt memory mapping when tile args is a string + * Fill identical pixels with transparency in subsequent frames when + saving GIF + * Corrected duration when combining multiple GIF frames into single frame + * Handle disposing GIF background from outside palette + * Seek past the data when skipping a PSD layer + * Import plugins relative to the module + * Translate encoder error codes to strings; deprecate + ``ImageFile.raise_oserror()`` + * Support reading BC4U and DX10 BC1 images + * Optimize ImageStat.Stat.extrema + * Handle pathlib.Path in FreeTypeFont + * Added support for reading DX10 BC4 DDS images + * Optimized ImageStat.Stat.count + * Correct PDF palette size when saving + * Fixed closing file pointer with olefile 0.47 + * Raise ValueError when TrueType font size is not greater than zero + * If absent, do not try to close fp when closing image + * Allow configuring JPEG restart marker interval on save + * Decrement reference count for PyObject + * Implement ``streamtype=1`` option for tables-only JPEG encoding + * If save_all PNG only has one frame, do not create animated image + * Fixed frombytes() for images with a zero dimension +- Switch to autosetup and pyproject macros. + +------------------------------------------------------------------- +Mon Nov 27 08:54:27 UTC 2023 - Dirk Müller + +- update to 10.1.0: + * Added TrueType default font to allow for different sizes + * Fixed invalid argument warning #7442 + * Added ImageOps cover method #7412 + * Catch struct.error from truncated EXIF when reading JPEG DPI + * Consider default image when selecting mode for PNG save_all + * Support BGR;15, BGR;16 and BGR;24 access, unpacking and + putdata #7303 + * Added CMYK to RGB unpacker #7310 + * Improved flexibility of XMP parsing #7274 + * Support reading 8-bit YCbCr TIFF images #7415 + * Allow saving I;16B images as PNG #7302 + * Corrected drawing I;16 points and writing I;16 text #7257 + * Set blue channel to 128 for BC5S #7413 + * Increase flexibility when reading IPTC fields #7319 + * Set C palette to be empty by default #7289 + * Added gs_binary to control Ghostscript use on all platforms + * Read bounding box information from the trailer of EPS files + if specified #7382 + * Added reading 8-bit color DDS images #7426 + * Added has_transparency_data #7420 + * Fixed bug when reading BC5S DDS images #7401 + * Prevent TIFF orientation from being applied more than once + * Use previous pixel alpha for QOI_OP_RGB #7357 + * Added BC5U reading #7358 + * Allow getpixel() to accept a list #7355 + * Allow GaussianBlur and BoxBlur to accept a sequence of x and + y radii #7336 + * Expand JPEG buffer size when saving optimized or progressive + * Added session type check for Linux in + ImageGrab.grabclipboard() #7332 + * Allow "loop=None" when saving GIF images #7329 + * Fixed transparency when saving P mode images to PDF #7323 + * Added saving LA images as PDFs #7299 + * Set SMaskInData to 1 for PDFs with alpha #7316, #7317 + * Changed Image mode property to be read-only by default #7307 + * Silence exceptions in _repr_jpeg_ and _repr_png_ #7266 + * Do not use transparency when saving GIF if it has been + removed when normalizing mode #7284 + * Fix missing symbols when libtiff depends on libjpeg #7270 + ------------------------------------------------------------------- Mon Sep 18 15:21:40 UTC 2023 - ecsos @@ -537,12 +791,12 @@ Wed Mar 3 07:41:14 UTC 2021 - Adrian Schröter * CVE-2021-25291: In TiffDecode.c, invalid tile boundaries could lead to an OOB Read in TiffReadRGBATile * CVE-2021-25292: The PDF parser has a catastrophic backtracking regex that could be used as a DOS attack. * CVE-2021-25293: There is an Out of Bounds Read in SGIRleDecode.c, since pillow 4.3.0. - + There is an Exhaustion of Memory DOS in the ICNS, ICO, and BLP container formats where Pillow did not properly check the reported size of the contained image. These images could cause arbitrariliy large memory allocations. This was reported by Jiayi Lin, Luke Shaffer, Xinran Xie, and Akshay Ajayan of ASU.edu. - + Other Changes A crash with the feature flags for LibJpeg and Webp on unreleased Python 3.10 has been fixed @@ -556,26 +810,26 @@ Thu Jan 28 15:07:09 UTC 2021 - Oliver Kurz Sun Jan 24 11:00:39 UTC 2021 - Dirk Müller - update to 8.1.0 (bsc#1180833, bsc#1180834, bsc#1180832): - * Fix TIFF OOB Write error. CVE-2020-35654 - * Fix for Read Overflow in PCX Decoding. CVE-2020-35653 - * Fix for SGI Decode buffer overrun. CVE-2020-35655 - * Fix OOB Read when saving GIF of xsize=1 - * Makefile updates - * Add support for PySide6 - * Use disposal settings from previous frame in APNG - * Added exception explaining that _repr_png_ saves to PNG - * Use previous disposal method in GIF load_end - * Allow putpalette to accept 1024 integers to include alpha values - * Fix OOB Read when writing TIFF with custom Metadata - * Added append_images support for ICO - * Block TIFFTAG_SUBIFD - * Fixed dereferencing potential null pointers - * Deprecate FreeType 2.7 - * Moved warning to end of execution - * Removed unused fromstring and tostring C methods - * init() if one of the formats is unrecognised - * Moved string_dimension CVE image to pillow-depends - * Support raw rgba8888 for DDS + * Fix TIFF OOB Write error. CVE-2020-35654 + * Fix for Read Overflow in PCX Decoding. CVE-2020-35653 + * Fix for SGI Decode buffer overrun. CVE-2020-35655 + * Fix OOB Read when saving GIF of xsize=1 + * Makefile updates + * Add support for PySide6 + * Use disposal settings from previous frame in APNG + * Added exception explaining that _repr_png_ saves to PNG + * Use previous disposal method in GIF load_end + * Allow putpalette to accept 1024 integers to include alpha values + * Fix OOB Read when writing TIFF with custom Metadata + * Added append_images support for ICO + * Block TIFFTAG_SUBIFD + * Fixed dereferencing potential null pointers + * Deprecate FreeType 2.7 + * Moved warning to end of execution + * Removed unused fromstring and tostring C methods + * init() if one of the formats is unrecognised + * Moved string_dimension CVE image to pillow-depends + * Support raw rgba8888 for DDS - drop patches python-Pillow-tiff-4.2.0.patch python-Pillow-tiff-fix-oob-read.patch (upstream) @@ -1224,7 +1478,7 @@ Mon Jan 15 10:01:18 UTC 2018 - tchvatal@suse.com ------------------------------------------------------------------- Fri Jan 12 12:52:24 UTC 2018 - idonmez@suse.com -- Add freetype-2.9.patch to fix tests with FreeType 2.9 gh#2954 +- Add freetype-2.9.patch to fix tests with FreeType 2.9 gh#2954 ------------------------------------------------------------------- Wed Jan 10 13:31:48 UTC 2018 - tchvatal@suse.com @@ -1438,7 +1692,7 @@ Wed Apr 12 17:33:12 UTC 2017 - toddrme2178@gmail.com - Update to 4.1.0 * Close files after loading if possible #2330 - * Fix Image Access to be reloadable when embedding the Python interpreter + * Fix Image Access to be reloadable when embedding the Python interpreter #2296 * Fetch DPI from EXIF if not specified in JPEG header #2449, #2472 * Removed winbuild checksum verification #2468 @@ -1448,12 +1702,12 @@ Wed Apr 12 17:33:12 UTC 2017 - toddrme2178@gmail.com * Pure Python Decoders, including Python decoder to fix for MSP images #1938 * Reorganized GifImagePlugin, fixes #2314. #2374 * Doc: Reordered operating systems in Compatibility Matrix #2436 - * Test: Additional tests for BurfStub, Eps, Container, GribStub, IPTC, Wmf, + * Test: Additional tests for BurfStub, Eps, Container, GribStub, IPTC, Wmf, XVThumb, ImageDraw, ImageMorph ImageShow #2425 * Health fixes #2437 - * Test: Correctness tests ContainerIO, XVThumbImagePlugin, - BufrStubImagePlugin, GribStubImagePlugin, FitsStubImagePlugin, - Hdf5StubImagePlugin, PixarImageFile, PsdImageFile #2443, #2442, #2441, #2440, + * Test: Correctness tests ContainerIO, XVThumbImagePlugin, + BufrStubImagePlugin, GribStubImagePlugin, FitsStubImagePlugin, + Hdf5StubImagePlugin, PixarImageFile, PsdImageFile #2443, #2442, #2441, #2440, #2431, #2430, #2428, #2427 * Remove unused imports #1822 * Replaced KeyError catch with dictionary get method #2424 @@ -1468,7 +1722,7 @@ Wed Apr 12 17:33:12 UTC 2017 - toddrme2178@gmail.com * Test: Fixed Qt tests for QT5 and saving 1 bit PNG #2394 * Test: docker builds for Arch and Debian Stretch #2394 * Updated libwebp to 0.6.0 on appveyor #2395 - * More explicit error message when saving to a file with invalid extension + * More explicit error message when saving to a file with invalid extension #2399 * Docs: Update some http urls to https #2403 * Preserve aux/alpha channels when performing Imagecms transforms #2355 @@ -1479,13 +1733,13 @@ Wed Apr 12 17:33:12 UTC 2017 - toddrme2178@gmail.com * Exclude .travis and contents from manifest #2386 * Remove 'MIT-like' from license #2145 * Tests: Add tests for several Image operations #2379 - * PNG: Moved iCCP chunk before PLTE chunk when saving as PNG, restricted + * PNG: Moved iCCP chunk before PLTE chunk when saving as PNG, restricted chunks known value/ordering #2347 - * Default to inch-interpretation for missing ResolutionUnit in + * Default to inch-interpretation for missing ResolutionUnit in TiffImagePlugin #2365 * Bug: Fixed segfault when using ImagingTk on pypy Issue #2376, #2359. * Bug: Fixed Integer overflow using ImagingTk on 32 bit platforms #2359 - * Tests: Added docker images for testing alternate platforms. See also + * Tests: Added docker images for testing alternate platforms. See also https://github.com/python-pillow/docker-images. #2368 * Removed PIL 1.0 era TK readme that concerns Windows 95/NT #2360 * Prevent `nose -v` printing docstrings #2369 @@ -1493,7 +1747,7 @@ Wed Apr 12 17:33:12 UTC 2017 - toddrme2178@gmail.com * Added context managers for file handling #2307 * Expose registered file extensions in Image #2343 * Make mode descriptor cache initialization thread-safe. #2351 - * Updated Windows test dependencies: Freetype 2.7.1, zlib 1.2.11 #2331, + * Updated Windows test dependencies: Freetype 2.7.1, zlib 1.2.11 #2331, #2332, #2357 * Followed upstream pngquant packaging reorg to libimagquant #2354 * Fix invalid string escapes #2352 @@ -1841,7 +2095,7 @@ Thu Sep 29 01:13:38 UTC 2016 - badshah400@gmail.com Mon May 23 00:16:32 CEST 2016 - ro@suse.de - ignore make check errors on all bigendian archs - (adding ppc s390 s390x) + (adding ppc s390 s390x) ------------------------------------------------------------------- Sun Mar 13 20:32:48 UTC 2016 - dmueller@suse.com @@ -1858,13 +2112,13 @@ Tue Mar 1 21:05:58 UTC 2016 - normand@linux.vnet.ibm.com Mon Feb 29 12:28:34 UTC 2016 - michael@stroeder.com - update to version 3.1.1 with security fixes: - * Fixed an integer overflow in Resample.c causing writes in the Python heap. - * Fixed a buffer overflow in PcdDecode.c causing a segfault when opening + * Fixed an integer overflow in Resample.c causing writes in the Python heap. + * Fixed a buffer overflow in PcdDecode.c causing a segfault when opening PhotoCD files. CVE-2016-TBD - * Fixed a buffer overflow in FliDecode.c causing a segfault when opening + * Fixed a buffer overflow in FliDecode.c causing a segfault when opening FLI files. CVE-2016-0775 (fixes bsc#965582) - * Fixed a buffer overflow in TiffDecode.c causing an arbitrary amount of - memory to be overwritten when opening a specially crafted invalid TIFF + * Fixed a buffer overflow in TiffDecode.c causing an arbitrary amount of + memory to be overwritten when opening a specially crafted invalid TIFF file. CVE-2016-0740 (fixes bsc#965579) ------------------------------------------------------------------- @@ -2084,7 +2338,7 @@ Tue Apr 21 14:13:51 UTC 2015 - tbechtold@suse.com Fri Feb 6 08:25:34 UTC 2015 - hpj@urpla.net - fix test for lossy webp alpha deviation of earlier lib versions - * Add Pillow-fixtests.patch + * Add Pillow-fixtests.patch ------------------------------------------------------------------- Thu Jan 8 10:55:04 UTC 2015 - tbechtold@suse.com @@ -2291,9 +2545,9 @@ Tue Jan 7 19:19:05 UTC 2014 - marko.kohtala@gmail.com ------------------------------------------------------------------- Wed Dec 11 20:08:40 UTC 2013 - hrvoje.senjan@gmail.com -- Added use-recommended-freetype-include.patch -- Freetype upstream - recommends using their macros together with ft2build include. - Positive sideeffect is that this patch makes it build with both +- Added use-recommended-freetype-include.patch -- Freetype upstream + recommends using their macros together with ft2build include. + Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older version ------------------------------------------------------------------- diff --git a/python-Pillow.spec b/python-Pillow.spec index f91670c..3b13d08 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -1,7 +1,7 @@ # # spec file for package python-Pillow # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,21 @@ # -%{?!python_module:%define python_module() python3-%{**}} -%define skip_python2 1 -%define skip_python36 1 %{?sle15_python_module_pythons} Name: python-Pillow -Version: 10.0.1 +Version: 10.4.0 Release: 0 Summary: Python Imaging Library (Fork) License: HPND URL: https://python-pillow.org/ -Source: https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/pillow/pillow-%{version}.tar.gz BuildRequires: %{python_module devel >= 3.8} BuildRequires: %{python_module olefile} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest >= 4.0} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module tk} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: libimagequant-devel BuildRequires: pkgconfig @@ -70,33 +69,21 @@ Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and Contributors. %prep -%setup -q -n Pillow-%{version} -%autopatch -p1 +%autosetup -p1 -n pillow-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install # add missing path %{python_expand echo "PIL" > %{buildroot}%{$python_sitearch}/PIL.pth} %python_expand %fdupes %{buildroot}%{$python_sitearch} %check %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1 -%if "%{_arch}" == "s390" || "%{_arch}" == "s390x" -echo "WARNING ignoring tests completely due to https://github.com/python-pillow/Pillow/issues/1204 and segfault" -%else -%if "%{_arch}" == "ppc" || "%{_arch}" == "ppc64" -$python selftest.py --installed || \ -echo "WARNING ignore failure https://github.com/python-pillow/Pillow/issues/1204" -pytest-%{$python_bin_suffix} --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.pypy3 -v || \ -echo "WARNING ignore failure https://github.com/python-pillow/Pillow/issues/1204" -%else $python selftest.py --installed pytest-%{$python_bin_suffix} --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.pypy3 -v -k 'not (test_stroke or test_stroke_multiline)' -%endif -%endif } %files %{python_files} @@ -104,7 +91,7 @@ pytest-%{$python_bin_suffix} --ignore=_build.python2 --ignore=_build.python3 --i %doc CHANGES.rst README.md %{python_sitearch}/PIL %{python_sitearch}/PIL.pth -%{python_sitearch}/Pillow-%{version}-py%{python_version}.egg-info +%{python_sitearch}/pillow-%{version}.dist-info %exclude %{python_sitearch}/PIL/ImageTk* %exclude %{python_sitearch}/PIL/_imagingtk* %pycache_only %exclude %{python_sitearch}/PIL/__pycache__/ImageTk.*