From 4b4e92c0f1e502674535a34f37349577cdd6cc6466451fe2b48b0d60ee72fd65 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Sat, 11 Apr 2015 16:57:39 +0000
Subject: [PATCH] Accepting request 295381 from home:frispete:python
- openSUSE versions up to 12.2 are affected as well from:
AssertionError: error: must supply either home or prefix/exec-prefix -- not both
raise version check of applying fix-sle11-test-failure.patch accordingly
OBS-URL: https://build.opensuse.org/request/show/295381
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=73
---
python-setuptools.changes | 7 +++++++
python-setuptools.spec | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/python-setuptools.changes b/python-setuptools.changes
index 143cec0..9caa129 100644
--- a/python-setuptools.changes
+++ b/python-setuptools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Apr 11 08:24:29 UTC 2015 - hpj@urpla.net
+
+- openSUSE versions up to 12.2 are affected as well from:
+ AssertionError: error: must supply either home or prefix/exec-prefix -- not both
+ raise version check of applying fix-sle11-test-failure.patch accordingly
+
-------------------------------------------------------------------
Fri Mar 27 14:30:44 UTC 2015 - tbechtold@suse.com
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 78416a7..4e60a46 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -63,7 +63,7 @@ especially ones that have dependencies on other packages.
%setup -q -n setuptools-%{version}
%patch1 -p1
%patch2 -p1
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%if 0%{?suse_version} && 0%{?suse_version} <= 1220
%patch3 -p1
%endif
find . -type f -name "*.orig" -delete