From afc272bba52a1467db907531d6c1fcd55186c07e4757ff3dee1afe331fb6d772 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Wed, 13 Apr 2016 11:08:29 +0000 Subject: [PATCH] Accepting request 386052 from home:stecue Removed mpi4py dependence for suse_version > 1320. Now python-vtk should be built in Factory. OBS-URL: https://build.opensuse.org/request/show/386052 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=72 --- python-vtk.changes | 5 +++++ python-vtk.spec | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/python-vtk.changes b/python-vtk.changes index 54b8265..66008fa 100644 --- a/python-vtk.changes +++ b/python-vtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 8 00:54:03 UTC 2016 - stecue@gmail.com + +- Remove mpi4py dependence for suse_version > 1320. + ------------------------------------------------------------------- Wed Mar 30 14:31:03 UTC 2016 - badshah400@gmail.com diff --git a/python-vtk.spec b/python-vtk.spec index 2555700..d6092fd 100644 --- a/python-vtk.spec +++ b/python-vtk.spec @@ -68,7 +68,9 @@ BuildRequires: libtiff-devel BuildRequires: netcdf-devel BuildRequires: openmpi-devel BuildRequires: python-devel +%if 0%{?suse_version} <= 1320 BuildRequires: python-mpi4py-devel +%endif BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: wget @@ -99,7 +101,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %else %define qtdir %{_lib}/qt4 %endif +%if 0%{?suse_version} <= 1320 Requires: python-mpi4py +%endif Requires: vtk = %{version} # DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN Requires: openmpi-devel @@ -201,7 +205,11 @@ cmake .. \ -DVTK_WRAP_TCL:BOOL=OFF \ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \ +%if 0%{?suse_version} <= 1320 -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON \ +%else + -DVTK_USE_SYSTEM_MPI4PY:BOOL=OFF \ +%endif %if 0%{?suse_version} > 1310 -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ %endif @@ -250,7 +258,9 @@ chrpath -d %{buildroot}%{_bindir}/* %{_libdir}/vtk/*Python*.so.* %{python_sitearch}/vtk/ # The following dir contains the built-in mpi4py, which is not needed if system version used. -# %%{_libdir}/vtk/site-packages +%if 0%{?suse_version} > 1320 +%{_libdir}/vtk/site-packages +%endif %dir %{_libdir}/vtk/ %exclude %{_libdir}/vtk/*QtPython*.so.*