diff --git a/npy_cpu.diff b/npy_cpu.diff new file mode 100644 index 0000000..a4a945f --- /dev/null +++ b/npy_cpu.diff @@ -0,0 +1,11 @@ +--- numpy/core/include/numpy/npy_cpu.h.orig 2010-05-31 06:37:01.000000000 +0000 ++++ numpy/core/include/numpy/npy_cpu.h 2010-05-31 06:52:40.000000000 +0000 +@@ -42,7 +42,7 @@ + #define NPY_CPU_S390 + #elif defined(__ia64) + #define NPY_CPU_IA64 +-#elif defined(__parisc__) ++#elif defined(__parisc__) || defined(__hppa) + /* XXX: Not sure about this one... */ + #define NPY_CPU_PARISC + #else diff --git a/python-numpy.changes b/python-numpy.changes index 4c93587..abf45dd 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon May 31 07:14:03 UTC 2010 - bg@novell.com + +- fix build for hppa + +------------------------------------------------------------------- +Fri Jan 15 12:00:00 CET 2010 - aeszter@gwdg.de + +- re-enable build on non-SUSE distros +- do not provide python-numeric on Fedora, since a package by that + name exists + ------------------------------------------------------------------- Wed Jan 13 16:29:10 UTC 2010 - lars@linux-schulserver.de diff --git a/python-numpy.spec b/python-numpy.spec index 2be0ec4..aa6bad2 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -22,17 +22,19 @@ Summary: NumPy: array processing for numbers, strings, records and object License: BSD Group: Development/Libraries/Python Version: 1.3.0 -Release: 2 +Release: 3 Url: http://sourceforge.net/projects/numpy Provides: numpy = %version-%release +%if 0%{?fedora_version} == 0 Provides: python-numeric = %version-%release +%endif BuildRequires: python-devel >= 2.4 BuildRequires: lapack BuildRequires: blas %if 0%{?suse_version} BuildRequires: gcc-fortran %py_requires -%else +%else BuildRequires: gcc-gfortran %{!?py_sitedir: %global py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif @@ -42,6 +44,7 @@ BuildRequires: fdupes Source: numpy-%{version}.tar.bz2 Source1: python-numpy-rpmlintrc Patch1: numpy-buildfix.patch +Patch2: npy_cpu.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,6 +76,7 @@ This package contains files for developing applications using numpy. %prep %setup -q -n numpy-%{version} %patch1 -p0 +%patch2 for i in $(find . -name "*.py"); do sed -i 's|^.*env python$|#!%{_bindir}/python|g' $i done @@ -103,9 +107,11 @@ rm -rf %{buildroot} %doc *.txt %dir %{py_sitedir}/numpy %{_bindir}/* -%if %suse_version >= 1020 +%if 0%{?sles_version} == 0 +%if 0%{?suse_version} >= 1020 || 0%{?fedora_version} %{py_sitedir}/*info %endif +%endif %{py_sitedir}/numpy/* %exclude %{py_sitedir}/numpy/*/*/*.c # %exclude %{py_sitedir}/numpy/*/*/*/*.c