From ac40b357752ff5f37c30f35af39c37fa5dc87a62ddc5cda49d772dce4ed68812 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 12 Nov 2013 10:18:32 +0000 Subject: [PATCH] - Add split-provides inside tk sub-package to get rid of python-imaging-tk OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=2 --- python-Pillow.changes | 5 +++++ python-Pillow.spec | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/python-Pillow.changes b/python-Pillow.changes index 0344748..406c208 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 12 10:18:12 UTC 2013 - speilicke@suse.com + +- Add split-provides inside tk sub-package to get rid of python-imaging-tk + ------------------------------------------------------------------- Thu Nov 7 13:09:45 UTC 2013 - speilicke@suse.com diff --git a/python-Pillow.spec b/python-Pillow.spec index 108a534..2b696e1 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -44,6 +44,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif # Pillow is a friendly PIL fork which we package as 'imaging', the latter isn't obsolete though: Conflicts: python-imaging +# 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 +Obsoletes: python-imaging-sane %description Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the @@ -53,6 +56,12 @@ 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 %description tk Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the