X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython-scikit-umfpack.git;a=blobdiff_plain;f=python-scikit-umfpack.spec;h=a1494126dfeb4db3a93263a1cc03d242e23214e5;hp=3698a9d7560f138a9b95dad19283af09f1ae5779;hb=398cc9b188174fe71544a40bdcbbc10778659830;hpb=dd9241ca6b03e56bf1c5784e790e17f25d26ff07;ds=sidebyside

diff --git a/python-scikit-umfpack.spec b/python-scikit-umfpack.spec
index 3698a9d..a149412 100644
--- a/python-scikit-umfpack.spec
+++ b/python-scikit-umfpack.spec
@@ -2,13 +2,13 @@
 # Conditional build:
 %bcond_without	tests	# unit tests
 %bcond_without	python2 # CPython 2.x module
-%bcond_without	python3 # CPython 3.x module
+%bcond_with	python3 # CPython 3.x module
 
 Summary:	Wrapper of UMFPACK sparse direct solver to SciPy
 Summary(pl.UTF-8):	Obudowanie procedur UMFPACK do rozwiązywania problemów na macierzach rzadkich dla SciPy
 Name:		python-scikit-umfpack
 Version:	0.3.2
-Release:	1
+Release:	4
 License:	BSD
 Group:		Libraries/Python
 #Source0Download: https://pypi.org/simple/scikit-umfpack/
@@ -18,6 +18,7 @@ URL:		https://pypi.org/project/scikit-umfpack/
 BuildRequires:	AMD-devel
 BuildRequires:	UMFPACK-devel
 BuildRequires:	blas-devel
+BuildRequires:	cblas-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
 BuildRequires:	swig-python >= 2.0.4
@@ -70,21 +71,23 @@ problemów na macierzach rzadkich dla SciPy.
 %build
 export BLAS=%{_libdir}
 export UMFPACK=%{_libdir}
+export CFLAGS="%{rpmcflags} -I/usr/include/umfpack"
 
 %if %{with python2}
-%py_build %{?with_tests:test}
+%py_build
 
 %if %{with tests}
-PYTHONPATH=$(readlink -f build-2/lib.*) \
+PYTHONPATH=$(readlink -f build-2/lib.*)/scikits/umfpack \
 nosetests-%{py_ver} scikits
 %endif
+find scikits -name '*.pyc' -exec rm -f {} \;
 %endif
 
 %if %{with python3}
-%py3_build %{?with_tests:test}
+%py3_build
 
 %if %{with tests}
-PYTHONPATH=$(readlink -f build-3/lib.*) \
+PYTHONPATH=$(readlink -f build-3/lib.*)/scikits/umfpack \
 nosetests-%{py3_ver} scikits
 %endif
 %endif
@@ -92,6 +95,9 @@ nosetests-%{py3_ver} scikits
 %install
 rm -rf $RPM_BUILD_ROOT
 
+export BLAS=%{_libdir}
+export UMFPACK=%{_libdir}
+
 %if %{with python2}
 %py_install
 # ensure scikits/__init__.py is compiled