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

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

Browse Source 
Fixing conflicting provides/conflicts that prevent installation of the tk subpackage.

This should fix the problems reported with the previous openSUSE:Factory submission.

OBS-URL: https://build.opensuse.org/request/show/235635
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=15
This commit is contained in:
Todd R 2014-05-28 08:43:10 +00:00 committed by Git OBS Bridge
parent 973f94461d
commit cce204024a
2 changed files with 13 additions and 6 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 @@
-------------------------------------------------------------------
Wed May 28 08:24:20 UTC 2014 - toddrme2178@gmail.com
- Fixing conflicting provides/conflicts that prevent installation
of the tk subpackage.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 27 08:25:54 UTC 2014 - mcihar@suse.com Tue May 27 08:25:54 UTC 2014 - mcihar@suse.com

13
python-Pillow.spec
View File

@ -65,12 +65,13 @@ Python Imaging Library by Fredrik Lundh and Contributors.
Summary: Python Imaging Library (Fork) - Tcl/Tk Module Summary: Python Imaging Library (Fork) - Tcl/Tk Module
Group: Development/Languages/Python Group: Development/Languages/Python
Requires: %{name} = %{version} Requires: %{name} = %{version}
# NOTE(saschpe): imaging used to (wrongly) ship the tk module too, so we've got to conflict with it. # NOTE: We don't need to conflict with python-imaging here,
Provides: python-imaging:%{python_sitearch}/PIL/ImageTk.py* # because this package depends on python-Pillow, which already conflicts with python-imaging,
Provides: python-imaging:%{python_sitearch}/PIL/_imagingtk.so # so this cannot be installed alongside python-imaging
# NOTE(saschpe): This would be to much, no?: # And we cannot conflict with python-imaging directly, since python-Pillow provides python-imaging
#Provides: python-imaging:%{_datadir}/doc/packages/python-imaging/Docs/pythondoc-PIL.ImageTk.html # Just in case, conflict with python-imaging-tk in case it is ever implemented.
Conflicts: python-imaging Obsoletes: python-imaging-tk
Provides: python-imaging-tk
%description tk %description tk
Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the