Hello community, here is the log from the commit of package python3-numpy for openSUSE:Factory checked in at 2013-12-08 19:34:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-numpy (Old) and /work/SRC/openSUSE:Factory/.python3-numpy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-numpy" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-numpy/python3-numpy.changes 2013-11-04 16:18:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-numpy.new/python3-numpy.changes 2013-12-08 19:34:42.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 6 06:22:05 UTC 2013 - adr...@suse.de + +- apply ppc6le fix from python2 version als here: + * numpy-double-double-le.patch + +------------------------------------------------------------------- New: ---- numpy-double-double-le.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-numpy-doc.spec ++++++ --- /var/tmp/diff_new_pack.TOPnll/_old 2013-12-08 19:34:43.000000000 +0100 +++ /var/tmp/diff_new_pack.TOPnll/_new 2013-12-08 19:34:43.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python3-numpy-doc Version: 1.8.0 Release: 0 @@ -28,13 +29,13 @@ %if 0%{?suse_version} == 1220 BuildRequires: python3-2to3 %endif +BuildRequires: python3-Sphinx BuildRequires: python3-devel BuildRequires: python3-doc -BuildRequires: python3-Sphinx BuildRequires: python3-matplotlib -BuildRequires: python3-pyparsing -BuildRequires: python3-numpydoc BuildRequires: python3-numpy-devel +BuildRequires: python3-numpydoc +BuildRequires: python3-pyparsing BuildArch: noarch Recommends: python3-numpy Provides: python3-numpy-doc-html = 1.7.1 ++++++ python3-numpy.spec ++++++ --- /var/tmp/diff_new_pack.TOPnll/_old 2013-12-08 19:34:43.000000000 +0100 +++ /var/tmp/diff_new_pack.TOPnll/_new 2013-12-08 19:34:43.000000000 +0100 @@ -27,15 +27,16 @@ Group: Development/Libraries/Python Source: http://sourceforge.net/projects/numpy/files/NumPy/%{version}/numpy-%{version}.tar.gz Patch0: numpy-buildfix.patch +Patch1: numpy-double-double-le.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: blas-devel BuildRequires: lapack-devel BuildRequires: python3 >= 3.2 BuildRequires: python3-devel >= 3.2 # Cython needed for mtrand.c regenerating (python3.3) -BuildRequires: python3-Cython BuildRequires: fdupes BuildRequires: gcc-fortran +BuildRequires: python3-Cython %if %{with_atlas} == 1 BuildRequires: libatlas3-devel %endif @@ -56,10 +57,10 @@ Summary: Development files for numpy applications Group: Development/Libraries/Python Requires: %{name} = %{version} -Requires: python3-devel >= %{py3_ver} Requires: blas-devel -Requires: lapack-devel Requires: gcc-fortran +Requires: lapack-devel +Requires: python3-devel >= %{py3_ver} %if %{with_atlas} == 1 Requires: libatlas3-devel %endif @@ -70,6 +71,7 @@ %prep %setup -q -n numpy-%{version} %patch0 -p1 +%patch1 # Fix non-executable scripts sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py ++++++ numpy-double-double-le.patch ++++++ Index: numpy/core/setup.py =================================================================== --- numpy/core/setup.py.orig +++ numpy/core/setup.py @@ -465,7 +465,7 @@ def configuration(parent_package='',top_ 'MOTOROLA_EXTENDED_12_BYTES_BE', 'IEEE_QUAD_LE', 'IEEE_QUAD_BE', 'IEEE_DOUBLE_LE', 'IEEE_DOUBLE_BE', - 'DOUBLE_DOUBLE_BE']: + 'DOUBLE_DOUBLE_BE', 'DOUBLE_DOUBLE_LE']: moredefs.append(('HAVE_LDOUBLE_%s' % rep, 1)) else: raise ValueError("Unrecognized long double format: %s" % rep) Index: numpy/core/setup_common.py =================================================================== --- numpy/core/setup_common.py.orig +++ numpy/core/setup_common.py @@ -256,6 +256,8 @@ _IEEE_QUAD_PREC_BE = ['300', '031', '326 _IEEE_QUAD_PREC_LE = _IEEE_QUAD_PREC_BE[::-1] _DOUBLE_DOUBLE_BE = ['301', '235', '157', '064', '124', '000', '000', '000'] + \ ['000'] * 8 +_DOUBLE_DOUBLE_LE = ['000', '000', '000', '124', '064', '157', '235', '301'] + \ + ['000'] * 8 def long_double_representation(lines): """Given a binary dump as given by GNU od -b, look for long double @@ -295,6 +297,8 @@ def long_double_representation(lines): return 'IEEE_QUAD_LE' elif read[8:-8] == _DOUBLE_DOUBLE_BE: return 'DOUBLE_DOUBLE_BE' + elif read[8:-8] == _DOUBLE_DOUBLE_LE: + return 'DOUBLE_DOUBLE_LE' elif read[:16] == _BEFORE_SEQ: if read[16:-8] == _IEEE_DOUBLE_LE: return 'IEEE_DOUBLE_LE' Index: numpy/core/src/npymath/ieee754.c.src =================================================================== --- numpy/core/src/npymath/ieee754.c.src.orig +++ numpy/core/src/npymath/ieee754.c.src @@ -133,7 +133,7 @@ float _nextf(float x, int p) return x; } -#ifdef HAVE_LDOUBLE_DOUBLE_DOUBLE_BE +#if defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE) || defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_LE) /* * FIXME: this is ugly and untested. The asm part only works with gcc, and we Index: numpy/core/src/npymath/npy_math_private.h =================================================================== --- numpy/core/src/npymath/npy_math_private.h.orig +++ numpy/core/src/npymath/npy_math_private.h @@ -435,7 +435,7 @@ do { typedef npy_uint32 ldouble_sign_t; #endif -#ifndef HAVE_LDOUBLE_DOUBLE_DOUBLE_BE +#if !defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE) && !defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_LE) /* Get the sign bit of x. x should be of type IEEEl2bitsrep */ #define GET_LDOUBLE_SIGN(x) \ (((x).a[LDBL_SIGN_INDEX] & LDBL_SIGN_MASK) >> LDBL_SIGN_SHIFT) @@ -476,7 +476,7 @@ do { ((x).a[LDBL_MANH_INDEX] & ~LDBL_MANH_MASK) | \ (((IEEEl2bitsrep_part)(v) << LDBL_MANH_SHIFT) & LDBL_MANH_MASK)) -#endif /* #ifndef HAVE_LDOUBLE_DOUBLE_DOUBLE_BE */ +#endif /* #if !defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE) && !defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_LE) */ /* * Those unions are used to convert a pointer of npy_cdouble to native C99 Index: numpy/core/src/private/npy_fpmath.h =================================================================== --- numpy/core/src/private/npy_fpmath.h.orig +++ numpy/core/src/private/npy_fpmath.h @@ -41,7 +41,8 @@ defined(HAVE_LDOUBLE_INTEL_EXTENDED_16_BYTES_LE) || \ defined(HAVE_LDOUBLE_INTEL_EXTENDED_12_BYTES_LE) || \ defined(HAVE_LDOUBLE_MOTOROLA_EXTENDED_12_BYTES_BE) || \ - defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE)) + defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE) || \ + defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_LE)) #error No long double representation defined #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
