From 6655e384326c8ebbe8944e806d5f6a1cfc8b318be79ce7c1a813615b9628ac81 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 24 Oct 2013 13:24:45 +0000 Subject: [PATCH] script also catched this one :-) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=53 --- python-setuptools.changes | 5 ----- python-setuptools.spec | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/python-setuptools.changes b/python-setuptools.changes index 286f560..7e297c4 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 24 11:14:13 UTC 2013 - speilicke@suse.com - -- Require python-setuptools instead of distribute (upstreams merged) - ------------------------------------------------------------------- Fri Oct 11 08:40:08 UTC 2013 - speilicke@suse.com diff --git a/python-setuptools.spec b/python-setuptools.spec index 4067ed5..3c60f20 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -35,8 +35,8 @@ Requires(post): update-alternatives Requires(postun): update-alternatives # NOTE(saschpe): Distribute was merged into 0.7.x, so even though distribute # obsoletes setuptools < 0.6.45, current setuptools obsoletes distribute again -Provides: python-setuptools = %{version} -Obsoletes: python-setuptools < %{version} +Provides: python-distribute = %{version} +Obsoletes: python-distribute < %{version} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else