From fe5f71f984a3c3fd776a6ab3ce0bbc302547118ad51642afb71f4dff1f58166a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 19 Aug 2014 08:12:37 +0000 Subject: [PATCH] Accepting request 245072 from home:Nijel:branches:devel:languages:python - Use versioned provides and conflicts to fix installation on SLE11 OBS-URL: https://build.opensuse.org/request/show/245072 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=21 --- python-Pillow.changes | 5 +++++ python-Pillow.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-Pillow.changes b/python-Pillow.changes index 8d38f9d..21ab66c 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 18 13:07:38 UTC 2014 - mcihar@suse.cz + +- Use versioned provides and conflicts to fix installation on SLE11 + ------------------------------------------------------------------- Mon Aug 11 09:05:47 UTC 2014 - mcihar@suse.cz diff --git a/python-Pillow.spec b/python-Pillow.spec index 0f65871..7603db7 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -49,11 +49,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %endif # Pillow is a friendly PIL fork which we package as 'imaging', the latter isn't obsolete though: -Conflicts: python-imaging +Conflicts: python-imaging < %{version} # 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 -Provides: python-imaging +Provides: python-imaging = %{version} Obsoletes: python-imaging-sane Provides: python-imaging-sane