From 5a8abcad0138018b3366779590edb83443fda9586c0b1f2087b3cd8943e1fc84 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Thu, 22 Sep 2011 08:58:19 +0000
Subject: [PATCH] Accepting request 84189 from devel:languages:python
- Update to version 1.6.1:
* Please see http://downloads.sourceforge.net/project/numpy/NumPy/1.6.1/Changelog
- Spec file cleanup:
* Set license to BSD-3-Clause (SPDX style)
* Removed testsuite from packages
* Removed rpmlintrc file and actually fixed the issues
OBS-URL: https://build.opensuse.org/request/show/84189
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=13
---
numpy-1.5.1.tar.bz2 | 3 --
numpy-1.6.1.tar.gz | 3 ++
python-numpy-rpmlintrc | 6 ---
python-numpy.changes | 10 ++++
python-numpy.spec | 104 ++++++++++++++++-------------------------
5 files changed, 52 insertions(+), 74 deletions(-)
delete mode 100644 numpy-1.5.1.tar.bz2
create mode 100644 numpy-1.6.1.tar.gz
delete mode 100644 python-numpy-rpmlintrc
diff --git a/numpy-1.5.1.tar.bz2 b/numpy-1.5.1.tar.bz2
deleted file mode 100644
index b64f7a1..0000000
--- a/numpy-1.5.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:001ebf9188aff8ec0f3d48baaa6c2b2276304a78f58cdafcf1db0bd4ece8e642
-size 1912127
diff --git a/numpy-1.6.1.tar.gz b/numpy-1.6.1.tar.gz
new file mode 100644
index 0000000..2266f79
--- /dev/null
+++ b/numpy-1.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:788b1bc712ee566d4b4d62ef99736c5830fa264cbc56f8651ded1e795c755cdd
+size 2637779
diff --git a/python-numpy-rpmlintrc b/python-numpy-rpmlintrc
deleted file mode 100644
index dedadc2..0000000
--- a/python-numpy-rpmlintrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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 32f037e..09117ae 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Sep 21 13:04:54 UTC 2011 - saschpe@suse.de
+
+- Update to version 1.6.1:
+ * Please see http://downloads.sourceforge.net/project/numpy/NumPy/1.6.1/Changelog
+- Spec file cleanup:
+ * Set license to BSD-3-Clause (SPDX style)
+ * Removed testsuite from packages
+ * Removed rpmlintrc file and actually fixed the issues
+
-------------------------------------------------------------------
Mon Jan 23 15:07:08 UTC 2011 - toddrme2178@gmail.com
diff --git a/python-numpy.spec b/python-numpy.spec
index 53f2b48..3ecc672 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -18,33 +18,33 @@
Name: python-numpy
-Summary: NumPy: array processing for numbers, strings, records and objects
-License: BSD
-Group: Development/Libraries/Python
-Version: 1.5.1
-Release: 1
+Version: 1.6.1
+Release: 0
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
+Summary: NumPy array processing for numbers, strings, records and objects
+License: BSD-3-Clause
+Group: Development/Libraries/Python
+Source: numpy-%{version}.tar.gz
+Patch1: numpy-buildfix.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: python-devel
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
+%else
+BuildRequires: gcc-gfortran
+%endif
+Provides: numpy = %{version}
+%if ! 0%{?fedora_version}
+Provides: python-numeric = %{version}
+Obsoletes: python-numeric < %{version}
+%endif
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%description
NumPy is a general-purpose array-processing package designed to
@@ -58,16 +58,18 @@ interfacing with general-purpose data-base applications.
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: lapack
Requires: blas
+%if 0%{?suse_version}
Requires: gcc-fortran
+%else
+BuildRequires: gcc-gfortran
+%endif
%description devel
This package contains files for developing applications using numpy.
@@ -75,62 +77,34 @@ This package contains files for developing applications using numpy.
%prep
%setup -q -n numpy-%{version}
%patch1 -p0
-for i in $(find . -name "*.py"); do
- sed -i 's|^.*env python$|#!%{_bindir}/python|g' $i
-done
+sed -i "1d" numpy/{compat/setup{,scons},distutils/{conv_template,cpuinfo,exec_command,from_template,setup,setupscons,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,setupscons,use_rules},ma/setup{,scons},matrixlib/setup{,scons},setup,setupscons,testing/print_coercion_tables,testing/setup{,scons}}.py # Fix non-executable scripts
%build
-env CFLAGS="%{optflags} -fno-strict-aliasing" \
-%{__python} setup.py build
+CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build
%install
-%{__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
+python setup.py install --root="%{buildroot}" --prefix="%{_prefix}"
+rm -rf %{buildroot}%{python_sitearch}/numpy/{,core,distutils,f2py,fft,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite
+rm -rf %{buildroot}%{python_sitearch}/numpy/core/lib/libnpymath.a # Don't package static libs
%if 0%{?suse_version} > 1020
-%fdupes -s %{buildroot}
+%fdupes -s %{buildroot}%{_prefix}
%endif
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root)
%doc *.txt
-%dir %{py_sitedir}/numpy
%{_bindir}/*
-%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
-%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
+%{python_sitearch}/*
+%exclude %{python_sitearch}/numpy/*/*/*.c
+%exclude %{python_sitearch}/numpy/*/*.h
+%exclude %{python_sitearch}/numpy/*/*/*.h
+%exclude %{python_sitearch}/numpy/*/*/*/*.h
-%files devel
+%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
+%{python_sitearch}/numpy/*/*/*.c
+%{python_sitearch}/numpy/*/*.h
+%{python_sitearch}/numpy/*/*/*.h
+%{python_sitearch}/numpy/*/*/*/*.h
%changelog