diff --git a/Pillow-9.4.0.tar.gz b/10.1.0.tar.gz similarity index 80% rename from Pillow-9.4.0.tar.gz rename to 10.1.0.tar.gz index 04ec29384b9c3efff358306f5c8c4d2c81a5ff8f..51e7ba71584ddcf5b3c42ba55eb07d57a003b470 100644 Binary files a/Pillow-9.4.0.tar.gz and b/10.1.0.tar.gz differ diff --git a/python-pillow.spec b/python-pillow.spec index 250d3852d126a07e373cfd70af008308fab14444..6bd2d44557e706901996cfc0225e57887a2786aa 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -5,17 +5,16 @@ %global srcname pillow %bcond_with doc -%bcond_with mingw Name: python-%{srcname} -Version: 9.4.0 +Version: 10.1.0 Release: %{anolis_release}%{dist} Summary: Python image processing library # License: see http://www.pythonware.com/products/pil/license.htm License: MIT URL: http://python-pillow.github.io/ -Source0: https://github.com/python-pillow/Pillow/archive/%{version}/Pillow-%{version}.tar.gz +Source0: https://github.com/python-pillow/Pillow/archive/refs/tags/%{version}.tar.gz BuildRequires: freetype-devel BuildRequires: gcc @@ -46,38 +45,6 @@ BuildRequires: python3-sphinx-removed-in %endif BuildRequires: python3-tkinter -%if %{with mingw} -BuildRequires: mingw32-filesystem >= 95 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-python3 -BuildRequires: mingw32-python3-setuptools -BuildRequires: mingw32-dlfcn -BuildRequires: mingw32-freetype -BuildRequires: mingw32-lcms2 -BuildRequires: mingw32-libimagequant -BuildRequires: mingw32-libjpeg -BuildRequires: mingw32-libtiff -BuildRequires: mingw32-libwebp -BuildRequires: mingw32-openjpeg2 -BuildRequires: mingw32-tk -BuildRequires: mingw32-zlib - -BuildRequires: mingw64-filesystem >= 95 -BuildRequires: mingw64-gcc -BuildRequires: mingw64-python3 -BuildRequires: mingw64-python3-setuptools -BuildRequires: mingw64-dlfcn -BuildRequires: mingw64-freetype -BuildRequires: mingw64-lcms2 -BuildRequires: mingw64-libimagequant -BuildRequires: mingw64-libjpeg -BuildRequires: mingw64-libtiff -BuildRequires: mingw64-libwebp -BuildRequires: mingw64-openjpeg2 -BuildRequires: mingw64-tk -BuildRequires: mingw64-zlib -%endif - # For EpsImagePlugin.py Requires: ghostscript @@ -148,24 +115,6 @@ Provides: python3-imaging-qt = %{version}-%{release} %description -n python3-%{srcname}-qt Qt %{srcname} image wrapper. -%if %{with mingw} -%package -n mingw32-python3-%{srcname} -Summary: MinGW Windows Python2 %{srcname} library -BuildArch: noarch - -%description -n mingw32-python3-%{srcname} -MinGW Windows Python2 %{srcname} library. - -%package -n mingw64-python3-%{srcname} -Summary: MinGW Windows Python2 %{srcname} library -BuildArch: noarch - -%description -n mingw64-python3-%{srcname} -MinGW Windows Python2 %{srcname} library. - -%{?mingw_debug_package} -%endif - %prep %autosetup -p1 -n Pillow-%{version} @@ -174,12 +123,6 @@ MinGW Windows Python2 %{srcname} library. %py3_build # python3 setup.py build --build-base build/lib.%{python3_platform}-%{python3_version} -# MinGW build -%if %{with mingw} -PKG_CONFIG=mingw32-pkg-config %{mingw32_py3_build} -PKG_CONFIG=mingw64-pkg-config %{mingw64_py3_build} -%endif - # Doc build %if %{with doc} PYTHONPATH=$PWD/build/%py3_libbuilddir make -C docs html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version @@ -192,25 +135,7 @@ install -d %{buildroot}/%{py3_incdir}/Imaging install -m 644 src/libImaging/*.h %{buildroot}/%{py3_incdir}/Imaging %py3_install -# MinGW build -%if %{with mingw} -install -d %{buildroot}/%{mingw32_py3_incdir}/Imaging -install -m 644 src/libImaging/*.h %{buildroot}/%{mingw32_py3_incdir}/Imaging - -install -d %{buildroot}/%{mingw64_py3_incdir}/Imaging -install -m 644 src/libImaging/*.h %{buildroot}/%{mingw64_py3_incdir}/Imaging - -%{mingw32_py3_install} -%{mingw64_py3_install} - -# Remove sample scripts -rm -rf %{buildroot}%{mingw32_bindir} -rm -rf %{buildroot}%{mingw64_bindir} -%endif - -%if %{with mingw} -%mingw_debug_install_post -%endif +%generate_compatibility_deps %check # Check Python 3 modules @@ -223,8 +148,6 @@ PYTHONPATH=$PWD %{__python3} selftest.py popd %pytest -v -k "not test_qt_image_qapplication" || : -%generate_compatibility_deps - %files -n python3-%{srcname} %license docs/COPYING %{python3_sitearch}/PIL/ @@ -257,21 +180,6 @@ popd %{python3_sitearch}/PIL/ImageQt* %{python3_sitearch}/PIL/__pycache__/ImageQt* -%if %{with mingw} - -%files -n mingw32-python3-%{srcname} -%license docs/COPYING -%{mingw32_python3_sitearch}/PIL/ -%{mingw32_python3_sitearch}/Pillow-%{version}-py%{mingw32_python3_version}.egg-info/ -%{mingw32_py3_incdir}/Imaging/ - -%files -n mingw64-python3-%{srcname} -%license docs/COPYING -%{mingw64_python3_sitearch}/PIL/ -%{mingw64_python3_sitearch}/Pillow-%{version}-py%{mingw64_python3_version}.egg-info/ -%{mingw64_py3_incdir}/Imaging/ -%endif - %files -n python3-%{srcname}-doc %doc README.md CHANGES.rst %if %{with doc} @@ -279,5 +187,8 @@ popd %endif %changelog +* Sun Nov 05 2023 Funda Wang - 10.1.0-1 +- New version 10.1.0 + * Tue Mar 21 2023 Zhongling He - 9.4.0-1 - Init package from upstream