From f81be4a10d5df8db8f8bdcc08c736b5f4f9671541ecfbd36300c7bdb5352b965 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 7 Jun 2012 13:39:34 +0000 Subject: [PATCH] Accepting request 123556 from devel:languages:python Add libatlas2 buildrequires. This provides very highly tuned linear algebra handling. (forwarded request 123555 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/123556 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=21 --- python-numpy-doc.changes | 10 +++ python-numpy-doc.spec | 178 +++++++++++++++++++++++++++++++++++++++ python-numpy.changes | 20 +++++ python-numpy.spec | 24 +++--- python3-numpy.changes | 15 ++++ python3-numpy.spec | 3 + 6 files changed, 236 insertions(+), 14 deletions(-) create mode 100644 python-numpy-doc.changes create mode 100644 python-numpy-doc.spec diff --git a/python-numpy-doc.changes b/python-numpy-doc.changes new file mode 100644 index 0000000..299e67b --- /dev/null +++ b/python-numpy-doc.changes @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 1 12:08:16 UTC 2012 - toddrme2178@gmail.com + +- Remove blas/lapack tests since these build successfully on all + targets now +- Add documentation packages + These are separate packages because a lot of packages depend on + numpy, so building the documentation inside the base spec file + would slow down the build process for the entire project + diff --git a/python-numpy-doc.spec b/python-numpy-doc.spec new file mode 100644 index 0000000..d2d60b4 --- /dev/null +++ b/python-numpy-doc.spec @@ -0,0 +1,178 @@ +# +# spec file for package python-numpy-doc +# +# Copyright (c) 2012 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +%define modname numpy +Name: python-%{modname}-doc +%define docname numpydoc +Version: 1.6.2 +%define docvers 0.4 +Release: 0 +Url: http://sourceforge.net/projects/numpy +Summary: Documentation for python-numpy +License: BSD-3-Clause +Group: Development/Libraries/Python +Source: %{modname}-%{version}.tar.gz +Patch1: numpy-buildfix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python-devel +BuildRequires: python-Sphinx +BuildRequires: python-matplotlib +BuildRequires: python-numpy-devel +BuildRequires: blas-devel +BuildRequires: lapack-devel +BuildRequires: texlive-latex +BuildRequires: zip +Provides: python-numpydoc = %{version} +Obsoletes: python-numpydoc < %{version} +%if 0%{?suse_version} +BuildRequires: gcc-fortran +BuildRequires: fdupes +%if 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%else +BuildArch: noarch +%py_requires +%endif +%else +BuildRequires: gcc-gfortran +%endif + +%description +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. + +There are also basic facilities for discrete fourier transform, +basic linear algebra and random number generation. + +This package provides the documentation for NumPy + +%package html +Summary: HTML documentation for python-%{modname} +Group: Development/Libraries/Python +Recommends: python-%{modname} = %{version} + +%description html +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. + +There are also basic facilities for discrete fourier transform, +basic linear algebra and random number generation. + +This package provides the HTML documentation for NumPy + +%package pdf +Summary: PDF documentation for python-%{modname} +Group: Development/Libraries/Python +Recommends: python-%{modname} = %{version} + +%description pdf +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. + +There are also basic facilities for discrete fourier transform, +basic linear algebra and random number generation. + +This package provides the PDF documentation for NumPy + +%package -n python-numpydoc +Summary: Custom extension for python-Sphinx from the python-numpy project +Group: Development/Libraries/Python +Requires: python-Sphinx +%if 0%{?suse_version} > 1110 +%{py_requires} +%endif + +%description -n python-numpydoc +Numpy's documentation uses several custom extensions to Sphinx. These are +shipped in this numpydoc package, in case you want to make use of them in +third-party projects. + +The following extensions are available: + +- numpydoc: support for the Numpy docstring format in Sphinx, and add the code +description directives np:function, np-c:function, etc. that support the Numpy +docstring syntax. + +- numpydoc.traitsdoc: For gathering documentation about Traits attributes. + +- numpydoc.plot_directives: Adaptation of Matplotlib's plot:: directive. This +implementation may still undergo severe changes or eventually be deprecated. + +- numpydoc.only_directives: (DEPRECATED) + +- numpydoc.autosummary: (DEPRECATED) An autosummary:: directive. Available in +Sphinx 0.6.2 and (to-be) 1.0 as sphinx.ext.autosummary, and it the Sphinx 1.0 +version is recommended over that included in Numpydoc. + + +%prep +%setup -q -n %{modname}-%{version} +%patch1 -p0 + +%build +# make the documentation +cd doc +make dist PYVER=%{py_ver} + +# make numpydoc +cd sphinxext +python setup.py build + +%install +# install the documentation +cd doc +mkdir -p %{buildroot}%{_docdir}/python-%{modname}/{html,pdf} +tar -xzf build/dist.tar.gz -C %{buildroot}%{_docdir}/python-%{modname}/html +mv %{buildroot}%{_docdir}/python-%{modname}/html/*.pdf %{buildroot}%{_docdir}/python-%{modname}/pdf/ + +%fdupes %{buildroot}%{_docdir}/python-%{modname}/html/ +%fdupes %{buildroot}%{_docdir}/python-%{modname}/pdf/ + +# install numpydoc +cd sphinxext +python setup.py install --prefix=%{_prefix} --root=%{buildroot} + +%files html +%defattr(-,root,root) +%{_docdir}/python-%{modname}/html/ + +%files pdf +%defattr(-,root,root) +%{_docdir}/python-%{modname}/pdf/ + +%files -n python-numpydoc +%defattr(-,root,root) +%{_bindir}/autosummary_generate +%{python_sitelib}/%{docname}/ +%{python_sitelib}/%{docname}-%{docvers}-py%{py_ver}.egg-info/ + +%changelog diff --git a/python-numpy.changes b/python-numpy.changes index 08663a0..75c6f75 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Jun 4 15:30:34 UTC 2012 - toddrme2178@gmail.com + +- Add libatlas2 buildrequires + +------------------------------------------------------------------- +Fri Jun 1 12:08:16 UTC 2012 - toddrme2178@gmail.com + +- Remove blas/lapack tests since these build successfully on all + targets now +- Add documentation packages + These are separate packages because a lot of packages depend on + numpy, so building the documentation inside the base spec file + would slow down the build process for the entire project + +------------------------------------------------------------------- +Fri Jun 1 11:46:41 CEST 2012 - kukuk@suse.de + +- Old products don't provide python(abi). + ------------------------------------------------------------------- Mon May 21 08:03:11 UTC 2012 - toddrme2178@gmail.com diff --git a/python-numpy.spec b/python-numpy.spec index b17f19a..a21cfe8 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -27,27 +27,28 @@ Source: %{modname}-%{version}.tar.gz Patch1: numpy-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -Requires: python(abi) >= %{py_ver} -Provides: numpy = %{version} -%if 0%{?suse_version} > 1110 BuildRequires: blas-devel BuildRequires: lapack-devel -%else -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -BuildRequires: blas -BuildRequires: lapack -%endif +Requires: python >= %{py_ver} +Provides: numpy = %{version} %if 0%{?suse_version} BuildRequires: gcc-fortran BuildRequires: fdupes +%if 0%{?suse_version} <= 1210 +BuildRequires: libatlas3-devel +%endif +%if 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%else %py_requires +%endif %else BuildRequires: gcc-gfortran -%endif %if ! 0%{?fedora_version} Provides: python-numeric = %{version} Obsoletes: python-numeric < %{version} %endif +%endif %description NumPy is a general-purpose array-processing package designed to @@ -66,13 +67,8 @@ Summary: Development files for %{modname} applications Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: python-devel -%if 0%{?suse_version} > 1110 Requires: blas-devel Requires: lapack-devel -%else -Requires: blas -Requires: lapack -%endif %if 0%{?suse_version} Requires: gcc-fortran %py_requires -d diff --git a/python3-numpy.changes b/python3-numpy.changes index 3df4ff3..2712d80 100644 --- a/python3-numpy.changes +++ b/python3-numpy.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 4 15:30:34 UTC 2012 - toddrme2178@gmail.com + +- Add libatlas2 buildrequires + +------------------------------------------------------------------- +Fri Jun 1 12:08:16 UTC 2012 - toddrme2178@gmail.com + +- Remove blas/lapack tests since these build successfully on all + targets now +- Add documentation packages + These are separate packages because a lot of packages depend on + numpy, so building the documentation inside the base spec file + would slow down the build process for the entire project + ------------------------------------------------------------------- Mon May 21 08:03:11 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-numpy.spec b/python3-numpy.spec index 4d3aa49..3dee790 100644 --- a/python3-numpy.spec +++ b/python3-numpy.spec @@ -31,6 +31,9 @@ BuildRequires: python3-2to3 BuildRequires: python3-devel BuildRequires: blas-devel BuildRequires: lapack-devel +%if 0%{?suse_version} <= 1210 +BuildRequires: libatlas3-devel +%endif %if 0%{?suse_version} <= 1140 %{!?python3_sitearch: %global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)}