pool/python-Pillow
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 516006 from home:TheBlackCat:branches:devel:languages:python

Browse Source 
- Improve TK handling.
- Fix self-obsoletes

OBS-URL: https://build.opensuse.org/request/show/516006
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=59
This commit is contained in:
Todd R 2017-08-10 21:50:40 +00:00 committed by Git OBS Bridge
parent b4299d0409
commit d8de93b777
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python-Pillow.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 10 21:36:33 UTC 2017 - toddrme2178@gmail.com
- Improve TK handling.
- Fix self-obsoletes
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 9 17:47:29 UTC 2017 - toddrme2178@gmail.com Wed Aug 9 17:47:29 UTC 2017 - toddrme2178@gmail.com

30
python-Pillow.spec
View File

@ -16,6 +16,12 @@
# #
%if ! 0%{?is_opensuse} && 0%{?sle_version} && 0%{sle_version} < 150000
%bcond_with tk
%else
%bcond_without tk
%endif
%define oldpython python %define oldpython python
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-Pillow Name: python-Pillow
@ -30,7 +36,7 @@ BuildRequires: %{python_module devel}
BuildRequires: %{python_module nose} BuildRequires: %{python_module nose}
BuildRequires: %{python_module olefile} BuildRequires: %{python_module olefile}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
%if 0%{?is_opensuse} %if %{with tk}
BuildRequires: %{python_module tk} BuildRequires: %{python_module tk}
%endif %endif
BuildRequires: fdupes BuildRequires: fdupes
@ -60,19 +66,15 @@ BuildRequires: %{python_module unittest2}
BuildRequires: openjpeg2-devel BuildRequires: openjpeg2-devel
%endif %endif
%ifpython2 %ifpython2
Obsoletes: %{oldpython}-imaging-sane # Pillow is a friendly PIL fork which we used to package as 'imaging'
Provides: %{oldpython}-imaging-sane # Without providing python-imaging, all packages requiring it will break
Obsoletes: %{oldpython}-imaging < %{version}
# Pillow is a friendly PIL fork which we package as 'imaging', the latter isn't obsolete though:
# NOTE(saschpe): python-imaging should have never provided this and I'm a bit relucatant do it either.
# http://en.opensuse.org/openSUSE:Upgrade_dependencies_explanation#Replace_a_package_by_another_with_the_same_functionality
# ALSO NOTE (frispete): without providing python-imaging, all packages requiring it will break
Conflicts: %{oldpython}-imaging < %{version}
Provides: %{oldpython}-imaging = %{version} Provides: %{oldpython}-imaging = %{version}
Obsoletes: %{oldpython}-imaging-sane < %{version}
Provides: %{oldpython}-imaging-sane = %{version}
%endif %endif
# explicitly do this for python 2 and 3 but not other versions which never had an -imaging package
%ifpython3 %ifpython3
Conflicts: python3-imaging < %{version} Obsoletes: python3-imaging < %{version}
Provides: python3-imaging = %{version} Provides: python3-imaging = %{version}
%endif %endif
%python_subpackages %python_subpackages
@ -92,8 +94,8 @@ Requires: python-tk
# so this cannot be installed alongside python-imaging # so this cannot be installed alongside python-imaging
# And we cannot conflict with python-imaging directly, since python-Pillow provides 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. # Just in case, conflict with python-imaging-tk in case it is ever implemented.
Obsoletes: %{oldpython}-imaging-tk Obsoletes: %{oldpython}-imaging-tk < %{version}
Provides: %{oldpython}-imaging-tk Provides: %{oldpython}-imaging-tk = %{version}
%endif %endif
%description tk %description tk
@ -158,7 +160,7 @@ $python test-installed.py
%pycache_only %exclude %{python_sitearch}/PIL/__pycache__/ImageTk.* %pycache_only %exclude %{python_sitearch}/PIL/__pycache__/ImageTk.*
%endif %endif
%if 0%{?is_opensuse} %if %{with tk}
%files %{python_files tk} %files %{python_files tk}
%defattr(-,root,root,-) %defattr(-,root,root,-)