diff --git a/pillow-10.2.0.tar.gz b/Pillow-10.2.0.tar.gz similarity index 80% rename from pillow-10.2.0.tar.gz rename to Pillow-10.2.0.tar.gz index 02b1f8302ae1c0c8717a23f9e7427b3223c52505..88f1434ecffb76ed0dbb07cb6c428416506e224c 100644 Binary files a/pillow-10.2.0.tar.gz and b/Pillow-10.2.0.tar.gz differ diff --git a/backport-Pillow-update-patches-for-10.2.0-and-fix-upstream-regression-with-setup.patch b/backport-Pillow-update-patches-for-10.2.0-and-fix-upstream-regression-with-setup.patch new file mode 100644 index 0000000000000000000000000000000000000000..4f88d53f183cc5c051be510b8837f3cf47001aea --- /dev/null +++ b/backport-Pillow-update-patches-for-10.2.0-and-fix-upstream-regression-with-setup.patch @@ -0,0 +1,108 @@ +From e2b7af457906e6ba92c09a50de33e0c218aa29ab Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sat, 20 Jan 2024 02:32:09 +0000 +Subject: [PATCH] Pillow: update patches for 10.2.0 and fix upstream regression + with setup.py + +--- + setup.cfg | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + setup.py | 3 ++- + 2 files changed, 70 insertions(+), 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +new file mode 100644 +index 0000000..a3b4f22 +--- /dev/null ++++ b/setup.cfg +@@ -0,0 +1,67 @@ ++[metadata] ++name = Pillow ++description = Python Imaging Library (Fork) ++long_description = file: README.md ++long_description_content_type = text/markdown ++url = https://python-pillow.org ++author = Jeffrey A. Clark (Alex) ++author_email = aclark@aclark.net ++license = HPND ++classifiers = ++ Development Status :: 6 - Mature ++ License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND) ++ Programming Language :: Python :: 3 ++ Programming Language :: Python :: 3 :: Only ++ Programming Language :: Python :: 3.8 ++ Programming Language :: Python :: 3.9 ++ Programming Language :: Python :: 3.10 ++ Programming Language :: Python :: 3.11 ++ Programming Language :: Python :: 3.12 ++ Programming Language :: Python :: Implementation :: CPython ++ Programming Language :: Python :: Implementation :: PyPy ++ Topic :: Multimedia :: Graphics ++ Topic :: Multimedia :: Graphics :: Capture :: Digital Camera ++ Topic :: Multimedia :: Graphics :: Capture :: Screen Capture ++ Topic :: Multimedia :: Graphics :: Graphics Conversion ++ Topic :: Multimedia :: Graphics :: Viewers ++keywords = Imaging ++project_urls = ++ Documentation=https://pillow.readthedocs.io ++ Source=https://github.com/python-pillow/Pillow ++ Funding=https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi ++ Release notes=https://pillow.readthedocs.io/en/stable/releasenotes/index.html ++ Changelog=https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst ++ Twitter=https://twitter.com/PythonPillow ++ Mastodon=https://fosstodon.org/@pillow ++ ++[options] ++packages = PIL ++python_requires = >=3.8 ++include_package_data = True ++package_dir = ++ = src ++ ++[options.extras_require] ++docs = ++ furo ++ olefile ++ sphinx>=2.4 ++ sphinx-copybutton ++ sphinx-inline-tabs ++ sphinx-removed-in ++ sphinxext-opengraph ++tests = ++ check-manifest ++ coverage ++ defusedxml ++ markdown2 ++ olefile ++ packaging ++ pyroma ++ pytest ++ pytest-cov ++ pytest-timeout ++ ++[flake8] ++extend-ignore = E203 ++max-line-length = 88 +diff --git a/setup.py b/setup.py +index 1bf0bcf..c9d0f90 100755 +--- a/setup.py ++++ b/setup.py +@@ -335,7 +335,7 @@ class pil_build_ext(build_ext): + ) + + def initialize_options(self): +- self.disable_platform_guessing = None ++ self.disable_platform_guessing = True + self.add_imaging_libs = "" + build_ext.initialize_options(self) + for x in self.feature: +@@ -987,6 +987,7 @@ ext_modules = [ + + try: + setup( ++ version=PILLOW_VERSION, + cmdclass={"build_ext": pil_build_ext}, + ext_modules=ext_modules, + zip_safe=not (debug_build() or PLATFORM_MINGW), +-- +2.33.0 + diff --git a/python-pillow.spec b/python-pillow.spec index d22a7a54366bbfeb7864aea8fd4b71161b7d1ee0..008ab18ea598ff0b4eb862b9ed03ec20aa589965 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -4,11 +4,13 @@ Name: python-pillow Version: 10.2.0 -Release: 1 +Release: 2 Summary: Python image processing library License: MIT URL: http://python-pillow.github.io/ -Source0: https://files.pythonhosted.org/packages/source/p/pillow/pillow-%{version}.tar.gz +Source0: https://github.com/python-pillow/Pillow/archive/%{version}/Pillow-%{version}.tar.gz + +Patch0: backport-Pillow-update-patches-for-10.2.0-and-fix-upstream-regression-with-setup.patch BuildRequires: freetype-devel ghostscript lcms2-devel libimagequant-devel libjpeg-devel libtiff-devel BuildRequires: libwebp-devel openjpeg2-devel tk-devel zlib-devel python3-cffi python3-devel python3-numpy python3-olefile @@ -88,7 +90,7 @@ Provides: python3-imaging-qt = %{version}-%{release} Qt pillow image wrapper. %prep -%autosetup -p1 -n pillow-%{version} +%autosetup -p1 -n Pillow-%{version} %build @@ -147,6 +149,9 @@ pytest --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.pypy3 -v %{python3_sitearch}/PIL/__pycache__/ImageQt* %changelog +* Wed Feb 21 2024 hanhuihiui - 10.2.0-2 +- replace source rpm + * Wed Feb 07 2024 xu_ping <707078654@qq.com> - 10.2.0-1 - Upgrade version to 10.2.0