Explorar o código

vtk: rebuild with hdf-1.8.20

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11780 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t %!s(int64=6) %!d(string=hai) anos
pai
achega
8d2234c31f
Modificáronse 1 ficheiros con 12 adicións e 7 borrados
  1. 12 7
      v/vtk/vtk-vl.spec

+ 12 - 7
v/vtk/vtk-vl.spec

@@ -6,13 +6,13 @@
 %{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitelib: %global tcl_sitelib %{_datadir}/tcl%{tcl_version}}
 
-%define _hdf5_version 1.8.14
+%define _hdf5_version 1.8.20
 
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Summary(ja): The Visualization Toolkit - ハイレベル3D可視化ライブラリ
 Name: vtk
 Version: 6.1.0
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 # This is a variant BSD license, a cross between BSD and ZLIB.
 # For all intents, it has the same rights and restrictions as BSD.
@@ -66,7 +66,7 @@ BuildRequires: mariadb-devel
 BuildRequires: netcdf-cxx-devel
 #BuildRequires: postgresql-devel
 BuildRequires: libpq-devel
-BuildRequires: R-devel
+BuildRequires: R
 BuildRequires: PyQt4-devel
 BuildRequires: sip-devel
 BuildRequires: sqlite3-devel
@@ -248,6 +248,7 @@ These data are required to run various examples from the examples package.
 %patch2 -p1 -b .netcdf
 %patch3 -p1 -b .glext
 %patch4 -p1 -b .type
+
 # Remove included thirdparty sources just to be sure
 # TODO - vtksqlite
 for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope
@@ -391,7 +392,7 @@ EOF
 # Install examples too
 for filelist in examples.list; do
     for file in `cat $filelist`; do
-	install -p bin/$file $RPM_BUILD_ROOT%{_bindir}
+  install -p bin/$file $RPM_BUILD_ROOT%{_bindir}
     done
 done
 
@@ -553,6 +554,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 23 2018 Toshiaki Ara <ara_t@384.jp> 6.1.0-3
+- rebuild with hdf-1.8.20
+- change BuildRequires: R-devel to BuildRequires: R
+
 * Sat Sep 03 2016 Toshiaki Ara <ara_t@384.jp> 6.1.0-2
 - rebuild with gcc-5.4.0
 
@@ -601,9 +606,9 @@ rm -rf $RPM_BUILD_ROOT
 - added %%define py_ver, py_dir
 - added %%{?_smp_mflags} to make
 - change for x86_64
-	- changed lib to %%{_lib}
-	- added VTK_INSTALL_LIB_DIR=PATH=/%{_lib} in cmake
-	- added --install-lib at VTK_PYTHON_SETUP_ARGS in cmake
+  - changed lib to %%{_lib}
+  - added VTK_INSTALL_LIB_DIR=PATH=/%{_lib} in cmake
+  - added --install-lib at VTK_PYTHON_SETUP_ARGS in cmake
 
 * Tue May 15 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 5.0.2-0vl2
 - rebuild with new environment/toolchain