From d22ca0e1c4362c92f32010f135d254451ff991d9f58ef96d8101e8279dd3d9ab Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Tue, 5 Jul 2016 09:43:28 +0000 Subject: [PATCH] Accepting request 406690 from home:lorenz:ELPA Fix build on SLE-11-SP4 OBS-URL: https://build.opensuse.org/request/show/406690 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=97 --- fix-sle11-test-failure.patch | 24 +++++++++++------------- python-setuptools.changes | 6 ++++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/fix-sle11-test-failure.patch b/fix-sle11-test-failure.patch index a68647a..cd84bba 100644 --- a/fix-sle11-test-failure.patch +++ b/fix-sle11-test-failure.patch @@ -2,16 +2,14 @@ This fixes a test failure on SLE11SP3: Error is: AssertionError: error: must supply either home or prefix/exec-prefix -- not both -Index: setuptools-15.0/setuptools/tests/test_egg_info.py -=================================================================== ---- setuptools-15.0.orig/setuptools/tests/test_egg_info.py -+++ setuptools-15.0/setuptools/tests/test_egg_info.py -@@ -61,7 +61,7 @@ class TestEggInfo: - ) - cmd = [ - 'install', -- '--home', env.paths['home'], -+ '--prefix', env.paths['home'], - '--install-lib', env.paths['lib'], - '--install-scripts', env.paths['scripts'], - '--install-data', env.paths['data'], +--- a/setuptools/tests/test_egg_info.py ++++ b/setuptools/tests/test_egg_info.py +@@ -217,7 +217,7 @@ class TestEggInfo(object): + if cmd is None: + cmd = [ + 'install', +- '--home', env.paths['home'], ++ '--prefix', env.paths['home'], + '--install-lib', env.paths['lib'], + '--install-scripts', env.paths['scripts'], + '--install-data', env.paths['data'], diff --git a/python-setuptools.changes b/python-setuptools.changes index 108a1ee..0696228 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 4 10:11:11 UTC 2016 - dev@stellardeath.org + +- Update fix-sle11-test-failure.patch to new line numbers and + indentation + ------------------------------------------------------------------- Mon Jul 4 08:57:47 UTC 2016 - tbechtold@suse.com