From cce204024a0f8984604fc0e12581e54f518ff5daf649a793487ecaf42f11ebfb Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 28 May 2014 08:43:10 +0000 Subject: [PATCH] Accepting request 235635 from home:TheBlackCat:branches:devel:languages:python 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 --- python-Pillow.changes | 6 ++++++ python-Pillow.spec | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/python-Pillow.changes b/python-Pillow.changes index ced4017..a9a753c 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -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 diff --git a/python-Pillow.spec b/python-Pillow.spec index ec96bab..f4f4d96 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -65,12 +65,13 @@ Python Imaging Library by Fredrik Lundh and Contributors. Summary: Python Imaging Library (Fork) - Tcl/Tk Module Group: Development/Languages/Python Requires: %{name} = %{version} -# NOTE(saschpe): imaging used to (wrongly) ship the tk module too, so we've got to conflict with it. -Provides: python-imaging:%{python_sitearch}/PIL/ImageTk.py* -Provides: python-imaging:%{python_sitearch}/PIL/_imagingtk.so -# NOTE(saschpe): This would be to much, no?: -#Provides: python-imaging:%{_datadir}/doc/packages/python-imaging/Docs/pythondoc-PIL.ImageTk.html -Conflicts: python-imaging +# 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: python-imaging-tk +Provides: python-imaging-tk %description tk Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the