1
0
forked from pool/python-Pillow

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
This commit is contained in:
Michal Čihař 2014-08-19 08:12:37 +00:00 committed by Git OBS Bridge
parent b4496d5889
commit fe5f71f984
2 changed files with 7 additions and 2 deletions

View File

@ -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 Mon Aug 11 09:05:47 UTC 2014 - mcihar@suse.cz

View File

@ -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)")} %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%endif %endif
# Pillow is a friendly PIL fork which we package as 'imaging', the latter isn't obsolete though: # 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. # 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 # 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 # ALSO NOTE (frispete): without providing python-imaging, all packages requiring it will break
Provides: python-imaging Provides: python-imaging = %{version}
Obsoletes: python-imaging-sane Obsoletes: python-imaging-sane
Provides: python-imaging-sane Provides: python-imaging-sane