Accepting request 943843 from home:bnavigator:branches:devel:languages:python

- Don't try to build on unsupported Python 3.6
- Remove python2 statements from specfile

OBS-URL: https://build.opensuse.org/request/show/943843
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=123
This commit is contained in:
Oliver Kurz 2022-01-04 21:24:59 +00:00 committed by Git OBS Bridge
parent 87b78bad68
commit 645eee0072
2 changed files with 8 additions and 20 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 4 21:06:31 UTC 2022 - Ben Greiner <code@bnavigator.de>
- Don't try to build on unsupported Python 3.6
- Remove python2 statements from specfile
-------------------------------------------------------------------
Mon Jan 3 08:31:45 UTC 2022 - Michael Ströder <michael@stroeder.com>

View File

@ -16,10 +16,9 @@
#
%define oldpython python
%{?!python_module:%define python_module() python3-%{**}}
%define skip_python2 1
%define skip_python36 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-Pillow
Version: 9.0.0
Release: 0
@ -27,7 +26,7 @@ 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
BuildRequires: %{python_module devel}
BuildRequires: %{python_module devel >= 3.7}
BuildRequires: %{python_module olefile}
BuildRequires: %{python_module pytest >= 4.0}
BuildRequires: %{python_module setuptools}
@ -52,14 +51,6 @@ Provides: python-imaging = %{version}
%if 0%{?suse_version} >= 1500
BuildRequires: pkgconfig(libopenjp2)
%endif
%ifpython2
# Pillow is a friendly PIL fork which we used to package as 'imaging'
# Without providing python-imaging, all packages requiring it will break
Obsoletes: %{oldpython}-imaging < %{version}
Provides: %{oldpython}-imaging = %{version}
Obsoletes: %{oldpython}-imaging-sane < %{version}
Provides: %{oldpython}-imaging-sane = %{version}
%endif
%python_subpackages
%description
@ -70,15 +61,6 @@ Python Imaging Library by Fredrik Lundh and Contributors.
Summary: Python Imaging Library (Fork) - Tcl/Tk Module
Requires: %{name} = %{version}
Requires: python-tk
%ifpython2
# NOTE: We don't need to conflict with python-imaging here,
# because this package depends on python-Pillow, which already conflicts with python-imaging,
# so this cannot be installed alongside python-imaging
# And we cannot conflict with python-imaging directly, since python-Pillow provides python-imaging
# Just in case, conflict with python-imaging-tk in case it is ever implemented.
Obsoletes: %{oldpython}-imaging-tk < %{version}
Provides: %{oldpython}-imaging-tk = %{version}
%endif
%description tk
Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the