From b0104303c0ddf712d31909c54fe64318f3608b1980b0471c125dccc857367d30 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Thu, 10 Aug 2017 12:10:30 +0000 Subject: [PATCH] Accepting request 514467 from devel:languages:python - Add xlocale.patch: xlocale.h: don't use obsolete OBS-URL: https://build.opensuse.org/request/show/514467 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=55 --- python-numpy-doc.changes | 6 ++++++ python-numpy-doc.spec | 3 +++ python-numpy.changes | 6 ++++++ python-numpy.spec | 3 +++ xlocale.patch | 12 ++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 xlocale.patch diff --git a/python-numpy-doc.changes b/python-numpy-doc.changes index 55c3d25..0f50632 100644 --- a/python-numpy-doc.changes +++ b/python-numpy-doc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 5 14:24:59 UTC 2017 - schwab@suse.de + +- Add xlocale.patch: + xlocale.h: don't use obsolete + ------------------------------------------------------------------- Thu Apr 6 16:44:43 UTC 2017 - toddrme2178@gmail.com diff --git a/python-numpy-doc.spec b/python-numpy-doc.spec index 2bf2d50..fac480d 100644 --- a/python-numpy-doc.spec +++ b/python-numpy-doc.spec @@ -28,6 +28,8 @@ Source: https://pypi.io/packages/source/n/numpy/numpy-%{version}.zip Patch0: numpy-buildfix.patch # PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure Patch1: numpy-1.9.0-remove-__declspec.patch +# PATCH-FIX-UPSTREAM don't use obsolete +Patch2: xlocale.patch BuildRequires: python3-Sphinx BuildRequires: python3-devel BuildRequires: python3-matplotlib @@ -71,6 +73,7 @@ This package provides the documentation for NumPy %setup -q -n numpy-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 # drop build date from doc to fix build-compare sed -i "s/\(html_last_updated_fmt = \).*/\\1None/" doc/source/conf.py diff --git a/python-numpy.changes b/python-numpy.changes index aeac72e..7b87108 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 5 14:24:59 UTC 2017 - schwab@suse.de + +- Add xlocale.patch: + xlocale.h: don't use obsolete + ------------------------------------------------------------------- Tue Jun 6 08:15:54 UTC 2017 - manfred99@gmx.ch diff --git a/python-numpy.spec b/python-numpy.spec index 1d62e3f..6e8ce51 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -52,6 +52,8 @@ Source: https://pypi.io/packages/source/n/numpy/numpy-%{version}.zip Patch0: numpy-buildfix.patch # PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure Patch1: numpy-1.9.0-remove-__declspec.patch +# PATCH-FIX-UPSTREAM don't use obsolete +Patch2: xlocale.patch BuildRequires: blas-devel %if 0%{?suse_version} BuildRequires: fdupes @@ -111,6 +113,7 @@ This package contains files for developing applications using numpy. %setup -q -n numpy-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Fix non-executable scripts sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py diff --git a/xlocale.patch b/xlocale.patch new file mode 100644 index 0000000..b76d97e --- /dev/null +++ b/xlocale.patch @@ -0,0 +1,12 @@ +Index: numpy-1.12.1/numpy/core/src/multiarray/numpyos.c +=================================================================== +--- numpy-1.12.1.orig/numpy/core/src/multiarray/numpyos.c ++++ numpy-1.12.1/numpy/core/src/multiarray/numpyos.c +@@ -15,7 +15,6 @@ + + #ifdef HAVE_STRTOLD_L + #include +-#include + #endif + +