diff --git a/python-numpy-rpmlintrc b/python-numpy-rpmlintrc new file mode 100644 index 0000000..dedadc2 --- /dev/null +++ b/python-numpy-rpmlintrc @@ -0,0 +1,6 @@ +# OBS error: +addFilter("no-packager-tag") +# this files have .py ending, but are not designed to be +# called directly +addFilter("non-executable-script") +addFilter(".*devel-file-in-non-devel-package.*/usr/lib.*/python.*") diff --git a/python-numpy.changes b/python-numpy.changes index 2e5b8b8..4c93587 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jan 13 16:29:10 UTC 2010 - lars@linux-schulserver.de + +- use a more generic way to define py_sitedir on all targets + +------------------------------------------------------------------- +Mon Jan 11 14:57:01 UTC 2010 - coolo@novell.com + +- remerge d:l:p version with O:F version + - split -devel package and add support for !suse targets + ------------------------------------------------------------------- Wed Apr 8 19:43:27 CEST 2009 - matejcik@suse.cz diff --git a/python-numpy.spec b/python-numpy.spec index 35c35a1..2be0ec4 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -1,7 +1,7 @@ # # spec file for package python-numpy (Version 1.3.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,112 +16,117 @@ # -%define modname numpy Name: python-numpy -Url: http://numpy.scipy.org/ -Summary: Array processing for numbers, strings, records and objects -Version: 1.3.0 -Release: 1 -License: BSD 3-Clause +Summary: NumPy: array processing for numbers, strings, records and objects +License: BSD Group: Development/Libraries/Python -Source: %{modname}-%{version}.tar.bz2 -Patch0: numpy-buildfix.patch +Version: 1.3.0 +Release: 2 +Url: http://sourceforge.net/projects/numpy +Provides: numpy = %version-%release +Provides: python-numeric = %version-%release +BuildRequires: python-devel >= 2.4 +BuildRequires: lapack +BuildRequires: blas +%if 0%{?suse_version} +BuildRequires: gcc-fortran +%py_requires +%else +BuildRequires: gcc-gfortran +%{!?py_sitedir: %global py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif +%if 0%{?suse_version} > 1020 +BuildRequires: fdupes +%endif +Source: numpy-%{version}.tar.bz2 +Source1: python-numpy-rpmlintrc +Patch1: numpy-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} -BuildRequires: python-devel %description -The fundamental package needed for scientific computing with Python is -called NumPy. This package contains: +NumPy is a general-purpose array-processing package designed to +efficiently manipulate large multi-dimensional arrays of arbitrary +records without sacrificing too much speed for small multi-dimensional +arrays. NumPy is built on the Numeric code base and adds features +introduced by numarray as well as an extended C-API and the ability to +create arrays of arbitrary type which also makes NumPy suitable for +interfacing with general-purpose data-base applications. -* a powerful N-dimensional array object - -* sophisticated (broadcasting) functions - -* basic linear algebra functions - -* basic Fourier transforms - -* sophisticated random number capabilities - -* tools for integrating Fortran code. - -Authors: Todd Miller Perry Greenfield - +There are also basic facilities for discrete fourier transform, +basic linear algebra and random number generation. +%package devel +License: BSD +Summary: Development files for numpy applications +Group: Development/Libraries/Python +Requires: %{name} = %{version} +Requires: python-devel +Requires: lapack +Requires: blas +Requires: gcc-fortran -Authors: --------- - Todd Miller - Perry Greenfield +%description devel +This package contains files for developing applications using numpy. %prep -%setup -q -n %{modname}-%{version} -%patch0 +%setup -q -n numpy-%{version} +%patch1 -p0 +for i in $(find . -name "*.py"); do + sed -i 's|^.*env python$|#!%{_bindir}/python|g' $i +done %build -export CFLAGS="%{optflags} -fno-strict-aliasing" -python setup.py build +env CFLAGS="%{optflags} -fno-strict-aliasing" \ +%{__python} setup.py build %install -rm -rf %{buildroot} -python setup.py install --prefix=%{_prefix} --record-rpm=INSTALLED_FILES --root="$RPM_BUILD_ROOT" +%{__python} setup.py install \ + --root="%{buildroot}" \ + --prefix="%{_prefix}" + +# make rpmlint happy, add executable flag, even if the file +# should be called by another script +# find %{buildroot}%{py_sitedir}/numpy/ -type f -name "*.py" -print0 | xargs -0 chmod +x + +# save space +%if 0%{?suse_version} > 1020 +%fdupes -s %{buildroot} +%endif %clean rm -rf %{buildroot} -%files -f INSTALLED_FILES +%files %defattr(-,root,root) -%doc COMPATIBILITY LICENSE.txt README.txt THANKS.txt DEV_README.txt +%doc *.txt +%dir %{py_sitedir}/numpy +%{_bindir}/* +%if %suse_version >= 1020 +%{py_sitedir}/*info +%endif +%{py_sitedir}/numpy/* +%exclude %{py_sitedir}/numpy/*/*/*.c +# %exclude %{py_sitedir}/numpy/*/*/*/*.c +%exclude %{py_sitedir}/numpy/*/*/*/*/*.c +%exclude %{py_sitedir}/numpy/*/*.h +%exclude %{py_sitedir}/numpy/*/*/*.h +%exclude %{py_sitedir}/numpy/*/*/*/*.h +%exclude %{py_sitedir}/numpy/*/*/*/*/*.h +# %exclude %{py_sitedir}/numpy/*/*/*/*.cxx +# %exclude %{py_sitedir}/numpy/*/*/*/*.cpp + +%files devel +%defattr(-,root,root) +%{py_sitedir}/numpy/*/*/*.c +# %{py_sitedir}/numpy/*/*/*/*.c +%{py_sitedir}/numpy/*/*/*/*/*.c +%{py_sitedir}/numpy/*/*.h +%{py_sitedir}/numpy/*/*/*.h +%{py_sitedir}/numpy/*/*/*/*.h +%{py_sitedir}/numpy/*/*/*/*/*.h +# %{py_sitedir}/numpy/*/*/*/*.cxx +# %{py_sitedir}/numpy/*/*/*/*.cpp %changelog -* Wed Apr 08 2009 matejcik@suse.cz -- update to 1.3.0 - * official python 2.6 support (although it did (mostly) - work before) - * new multiarray APIs -* Wed Feb 11 2009 ro@suse.de -- fix filelist by using "--record-rpm" instead of "--record" - (and do not quote lines starting with "%%dir ") -* Wed Feb 04 2009 matejcik@suse.cz -- package taken directly from devel:languages:python repository, - original changelog follows: -* Tue Dec 02 2008 - James Oakley - 1.2.1-1 -- Update to 1.2.1 -* Mon Aug 11 2008 - James Oakley - 1.1.1-1 -- Update to 1.1.1: - - Python 2.3.x fixes - * Robert Kern -- remove development branch of f2py. - * Pierre GM -- masked array, fix dictionary update. - * Pierre GM -- masked array, fix itertools groupby dependency. - * Pierre GM -- masked array, fix use of iterators. - * Neil Muller -- fix test dependency on pretty print (#828). - - General improvements - * David Cournapeau -- scons build fixes/improvements. - * Stefan van der Walt -- Howto document updates. - * Fernando Perez -- cython updates. - * Robert Kern -- PyPI metadata fixes. - - Bug fixes - * #791 -- Travis Oliphant, std/var not properly calling array_finalize. - * #798 -- Stefan van der Walt, piecewise exposes raw memory. - * #810 -- David Huard, Verbose argument not effective for ndarrays in assert_equal. - * #828 -- Neil Muller, numpy file format format test failures on Solaris. - * #825 -- Neil Muller/Charles Harris, SIGBUS in UNICODE_getattr on Sparc Linux. - * #837 -- Pauli Virtanen, Infinite loop in fromfile & fromstring - * #841 -- Charles Harris, make numpy complex types print like Python. - * #843 -- Michael Abbott, reference count error in PyArray_CanCoerceScalar - * #844 -- David Cournapeau, failure with numpy inner. - * #848 -- Michael Abbott/Charles Harris/Travis Oliphant, reference leak. - * #849 -- Michael Abbott, reference to deallocated object. - * #850 -- Michael Abbott, memory leak. - * #854 -- Pauli Virtanen, Non-standard branch cuts (arccosh). - * #857 -- Pierre GM, dividing masked array with newaxis fails. - * ------- David Cournapeau, ctypes load_library fix. - * ------- Ryan May, Stefan van der Walt, fix loadtxt. - * ------- Robert Kern, make numeric.py functions return booleans. - * ------- Robert Kern, correct old numeric typecodes. - * ------- Robert Kern, fix raising exception in tests. - * ------- Robert Kern, make sure Zipf results are in allowable range. - * ------- Robert Kern, fix c++ style comment. diff --git a/rpmlintrc b/rpmlintrc deleted file mode 100644 index 35b1e07..0000000 --- a/rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter(".*devel-file-in-non-devel-package.*/usr/lib.*/python.*")