Actually use the proper __python? macros

This commit is contained in:
Thomas Spura 2014-02-20 11:40:53 +01:00
parent 76638c401e
commit 17734bb24b

View File

@ -95,11 +95,11 @@ cp -a . %{py3dir}
%build %build
%if 0%{?with_python3} %if 0%{?with_python3}
pushd %{py3dir} pushd %{py3dir}
env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} __python3 setup.py config_fc --fcompiler=gnu95 --noarch build env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} %__python3 setup.py config_fc --fcompiler=gnu95 --noarch build
popd popd
%endif # with _python3 %endif # with _python3
env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} __python2 setup.py config_fc --fcompiler=gnu95 --noarch build env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} %__python2 setup.py config_fc --fcompiler=gnu95 --noarch build
@ -108,11 +108,11 @@ rm -rf $RPM_BUILD_ROOT
# first install python3 so the binaries are overwritten by the python2 ones # first install python3 so the binaries are overwritten by the python2 ones
%if 0%{?with_python3} %if 0%{?with_python3}
pushd %{py3dir} pushd %{py3dir}
env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} __python3 setup.py install --root=$RPM_BUILD_ROOT env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} %__python3 setup.py install --root=$RPM_BUILD_ROOT
popd popd
%endif # with_python3 %endif # with_python3
env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} __python2 setup.py install --root=$RPM_BUILD_ROOT env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} %__python2 setup.py install --root=$RPM_BUILD_ROOT
%check %check
@ -120,13 +120,13 @@ env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdi
pushd %{py3dir} pushd %{py3dir}
mkdir test mkdir test
cd test cd test
PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitearch} __python3 -c "import scipy; scipy.test('full')" PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitearch} %__python3 -c "import scipy; scipy.test('full')"
popd popd
%endif # with_python3 %endif # with_python3
mkdir test mkdir test
cd test cd test
PYTHONPATH=$RPM_BUILD_ROOT%{python2_sitearch} __python2 -c "import scipy; scipy.test('full')" PYTHONPATH=$RPM_BUILD_ROOT%{python2_sitearch} %__python2 -c "import scipy; scipy.test('full')"
%clean %clean