Update to 7.0.0

.gitignore

@@ -46,3 +46,4 @@
 /Pillow-6.2.0.tar.gz
 /python-pillow-6.2.1-1.fc32.src.rpm
 /Pillow-6.2.1.tar.gz
+/Pillow-7.0.0.tar.gz

python-pillow.spec

@@ -1,11 +1,5 @@
-%global py2_incdir %(python2 -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())')
-%global py2_libbuilddir %(python2 -c 'import sys; import sysconfig; print("lib.{p}-{v[0]}.{v[1]}".format(p=sysconfig.get_platform(), v=sys.version_info))')
-
-%if 0%{?fedora} || 0%{?rhel} > 7
-%global with_python3 1
 %global py3_incdir %(python3 -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())')
 %global py3_libbuilddir %(python3 -c 'import sys; import sysconfig; print("lib.{p}-{v[0]}.{v[1]}".format(p=sysconfig.get_platform(), v=sys.version_info))')
-%endif
 
 %global srcname pillow
 # bootstrap building docs (pillow is required by docutils, docutils are
@@ -13,7 +7,7 @@
 %global with_docs 1
 
 Name:           python-%{srcname}
-Version:        6.2.1
+Version:        7.0.0
 Release:        1%{?dist}
 Summary:        Python image processing library
 
@@ -35,12 +29,6 @@ BuildRequires:  openjpeg2-devel
 BuildRequires:  tk-devel
 BuildRequires:  zlib-devel
 
-BuildRequires:  python2-devel
-BuildRequires:  python2-numpy
-BuildRequires:  python2-olefile
-BuildRequires:  python2-setuptools
-
-%if 0%{?with_python3}
 BuildRequires:  python3-cffi
 BuildRequires:  python3-devel
 BuildRequires:  python3-numpy
@@ -52,12 +40,10 @@ BuildRequires:  python3-sphinx
 BuildRequires:  python3-sphinx_rtd_theme
 %endif
 BuildRequires:  python3-tkinter
-%endif
 
 # For EpsImagePlugin.py
 Requires:       ghostscript
 
-%global __provides_exclude_from ^%{python2_sitearch}/PIL/.*\\.so$
 %global __provides_exclude_from ^%{python3_sitearch}/PIL/.*\\.so$
 
 %description
@@ -70,37 +56,6 @@ There are four subpackages: tk (tk interface), qt (PIL image wrapper for Qt),
 devel (development) and doc (documentation).
 
 
-%package -n python2-%{srcname}
-Summary:        Python 2 image processing library
-%{?python_provide:%python_provide python2-%{srcname}}
-Provides:       python-imaging = %{version}-%{release}
-Provides:       python2-imaging = %{version}-%{release}
-# For MicImagePlugin.py, FpxImagePlugin.py
-Requires:       python2-olefile
-
-%description -n python2-%{srcname}
-Python image processing library, fork of the Python Imaging Library (PIL)
-
-This library provides extensive file format support, an efficient
-internal representation, and powerful image processing capabilities.
-
-There are four subpackages: tk (tk interface), qt (PIL image wrapper for Qt),
-devel (development) and doc (documentation).
-
-
-%package -n python2-%{srcname}-devel
-Summary:        Development files for %{srcname}
-Requires:       python2-devel, libjpeg-devel, zlib-devel
-Requires:       python2-%{srcname}%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-%{srcname}-devel}
-Provides:       python-imaging-devel = %{version}-%{release}
-Provides:       python2-imaging-devel = %{version}-%{release}
-
-%description -n python2-%{srcname}-devel
-Development files for %{srcname}.
-
-
-%if 0%{?with_python3}
 %package -n python3-%{srcname}
 Summary:        Python 3 image processing library
 %{?python_provide:%python_provide python3-%{srcname}}
@@ -135,7 +90,6 @@ BuildArch:      noarch
 Requires:       python3-%{srcname} = %{version}-%{release}
 %{?python_provide:%python_provide python3-%{srcname}-doc}
 Provides:       python3-imaging-doc = %{version}-%{release}
-Obsoletes:      python2-%{srcname}-doc < 5.4.1-4
 
 %description -n python3-%{srcname}-doc
 Documentation for %{srcname}.
@@ -161,7 +115,6 @@ Provides:       python3-imaging-qt = %{version}-%{release}
 
 %description -n python3-%{srcname}-qt
 Qt %{srcname} image wrapper.
-%endif
 
 
 %prep
@@ -169,10 +122,6 @@ Qt %{srcname} image wrapper.
 
 
 %build
-# Build Python 2 modules
-%py2_build
-
-%if 0%{?with_python3}
 # Build Python 3 modules
 %py3_build
 
@@ -180,33 +129,16 @@ Qt %{srcname} image wrapper.
 PYTHONPATH=$PWD/build/%py3_libbuilddir make -C docs html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version
 rm -f docs/_build_py3/html/.buildinfo
 %endif
-%endif
 
 
 %install
-# Install Python 2 modules
-install -d %{buildroot}/%{py2_incdir}/Imaging
-install -m 644 src/libImaging/*.h %{buildroot}/%{py2_incdir}/Imaging
-%py2_install
-
-%if 0%{?with_python3}
 # Install Python 3 modules
 install -d %{buildroot}/%{py3_incdir}/Imaging
 install -m 644 src/libImaging/*.h %{buildroot}/%{py3_incdir}/Imaging
 %py3_install
-%endif
 
 
 %check
-# Check Python 2 modules
-ln -s $PWD/Images $PWD/build/%py2_libbuilddir/Images
-cp -R $PWD/Tests $PWD/build/%py2_libbuilddir/Tests
-cp -R $PWD/selftest.py $PWD/build/%py2_libbuilddir/selftest.py
-pushd build/%py2_libbuilddir
-PYTHONPATH=$PWD %{__python2} selftest.py
-popd
-
-%if 0%{?with_python3}
 # Check Python 3 modules
 ln -s $PWD/Images $PWD/build/%py3_libbuilddir/Images
 cp -R $PWD/Tests $PWD/build/%py3_libbuilddir/Tests
@@ -214,23 +146,8 @@ cp -R $PWD/selftest.py $PWD/build/%py3_libbuilddir/selftest.py
 pushd build/%py3_libbuilddir
 PYTHONPATH=$PWD %{__python3} selftest.py
 popd
-%endif
 
 
-%files -n python2-%{srcname}
-%doc README.rst CHANGES.rst
-%license docs/COPYING
-%{python2_sitearch}/*
-# These are in subpackages
-%exclude %{python2_sitearch}/PIL/_imagingtk*
-%exclude %{python2_sitearch}/PIL/ImageTk*
-%exclude %{python2_sitearch}/PIL/SpiderImagePlugin*
-%exclude %{python2_sitearch}/PIL/ImageQt*
-
-%files -n python2-%{srcname}-devel
-%{py2_incdir}/Imaging/
-
-%if 0%{?with_python3}
 %files -n python3-%{srcname}
 %doc README.rst CHANGES.rst
 %license docs/COPYING
@@ -262,10 +179,13 @@ popd
 %files -n python3-%{srcname}-qt
 %{python3_sitearch}/PIL/ImageQt*
 %{python3_sitearch}/PIL/__pycache__/ImageQt*
-%endif
 
 
 %changelog
+* Tue Jan 07 2020 Sandro Mani <manisandro@gmail.com> - 7.0.0-1
+- Update to 7.0.0
+- Drop python2 packages
+
 * Mon Oct 21 2019 Sandro Mani <manisandro@gmail.com> - 6.2.1-1
 - Update to 6.2.1
 

sources

@@ -1 +1 @@
-SHA512 (Pillow-6.2.1.tar.gz) = ee757ec2b8382d6d56fd0f0cdd4cd36440cc37f05741e27fc661449a16dc7c868966772060adb283de1b1b5ebc49b8eec46e0bdcdad9f5f4d5ebd77feab7ad31
+SHA512 (Pillow-7.0.0.tar.gz) = 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73