From 356eb6c492c79e9244238a870e49e769e1c0c694cedcda79fdcd177ef537a769 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <dleuenberger@suse.com> Date: Tue, 20 Jun 2017 09:00:48 +0000 Subject: [PATCH] Accepting request 503339 from devel:languages:python Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/503339 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=54 --- python-numpy-doc.spec | 4 ++++ python-numpy.changes | 5 +++++ python-numpy.spec | 14 +++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/python-numpy-doc.spec b/python-numpy-doc.spec index 3c76f5f..2bf2d50 100644 --- a/python-numpy-doc.spec +++ b/python-numpy-doc.spec @@ -36,7 +36,9 @@ BuildRequires: python3-numpydoc BuildRequires: python3-setuptools BuildRequires: zip BuildRequires: unzip +%if 0%{?suse_version} BuildRequires: fdupes +%endif Provides: python2-numpy-doc = %{version} Provides: python3-numpy-doc = %{version} Provides: python2-numpy-doc-html = %{version} @@ -84,7 +86,9 @@ popd # install the documentation mkdir -p %{buildroot}%{_docdir}/python-numpy/ cp -r doc/build/html %{buildroot}%{_docdir}/python-numpy/ +%if 0%{?suse_version} %fdupes %{buildroot}%{_docdir}/python-numpy/html/ +%endif %files diff --git a/python-numpy.changes b/python-numpy.changes index 2263b48..aeac72e 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 6 08:15:54 UTC 2017 - manfred99@gmx.ch + +- allow building numpy on fedora by making fdupes dependency optional + ------------------------------------------------------------------- Thu Apr 6 16:44:43 UTC 2017 - toddrme2178@gmail.com diff --git a/python-numpy.spec b/python-numpy.spec index d7f619b..1d62e3f 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -53,8 +53,14 @@ Patch0: numpy-buildfix.patch # PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure Patch1: numpy-1.9.0-remove-__declspec.patch BuildRequires: blas-devel +%if 0%{?suse_version} BuildRequires: fdupes +%endif +%if 0%{?suse_version} BuildRequires: gcc-fortran +%else +BuildRequires: gcc-gfortran +%endif BuildRequires: lapack-devel BuildRequires: unzip BuildRequires: python-rpm-macros @@ -86,7 +92,11 @@ Summary: Development files for numpy applications Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: blas-devel -Requires: gcc-fortran +%if 0%{?suse_version} +BuildRequires: gcc-fortran +%else +BuildRequires: gcc-gfortran +%endif Requires: lapack-devel Requires: python-devel %if %{with openblas} @@ -113,7 +123,9 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %install %python_exec setup.py install --prefix=%{_prefix} --root=%{buildroot} %python_expand rm -rf %{buildroot}%{$python_sitearch}/numpy/{,core,distutils,f2py,fft,lib,linalg,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite +%if 0%{?suse_version} %fdupes %{buildroot}%{prefix} +%endif %files %{python_files}