rpm/vtk
SHA256
1
0
Fork 0
forked from pool/vtk
Code Pull Requests Activity

Accepting request 386052 from home:stecue

Browse Source 
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
This commit is contained in:
Atri Bhattacharya 2016-04-13 11:08:29 +00:00 committed by Git OBS Bridge
parent da53c9cbcb
commit afc272bba5
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-vtk.changes
View File

@ -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 Wed Mar 30 14:31:03 UTC 2016 - badshah400@gmail.com

12
python-vtk.spec
View File

@ -68,7 +68,9 @@ BuildRequires: libtiff-devel
BuildRequires: netcdf-devel BuildRequires: netcdf-devel
BuildRequires: openmpi-devel BuildRequires: openmpi-devel
BuildRequires: python-devel BuildRequires: python-devel
%if 0%{?suse_version} <= 1320
BuildRequires: python-mpi4py-devel BuildRequires: python-mpi4py-devel
%endif
BuildRequires: tcl-devel BuildRequires: tcl-devel
BuildRequires: tk-devel BuildRequires: tk-devel
BuildRequires: wget BuildRequires: wget
@ -99,7 +101,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%else %else
%define qtdir %{_lib}/qt4 %define qtdir %{_lib}/qt4
%endif %endif
%if 0%{?suse_version} <= 1320
Requires: python-mpi4py Requires: python-mpi4py
%endif
Requires: vtk = %{version} Requires: vtk = %{version}
# DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN # DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN
Requires: openmpi-devel Requires: openmpi-devel
@ -201,7 +205,11 @@ cmake .. \
-DVTK_WRAP_TCL:BOOL=OFF \ -DVTK_WRAP_TCL:BOOL=OFF \
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \
-DVTK_USE_SYSTEM_NETCDF:BOOL=ON \ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \
%if 0%{?suse_version} <= 1320
-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON \ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON \
%else
-DVTK_USE_SYSTEM_MPI4PY:BOOL=OFF \
%endif
%if 0%{?suse_version} > 1310 %if 0%{?suse_version} > 1310
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
%endif %endif
@ -250,7 +258,9 @@ chrpath -d %{buildroot}%{_bindir}/*
%{_libdir}/vtk/*Python*.so.* %{_libdir}/vtk/*Python*.so.*
%{python_sitearch}/vtk/ %{python_sitearch}/vtk/
# The following dir contains the built-in mpi4py, which is not needed if system version used. # 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/ %dir %{_libdir}/vtk/
%exclude %{_libdir}/vtk/*QtPython*.so.* %exclude %{_libdir}/vtk/*QtPython*.so.*