X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=vtk.spec;h=e0e1fd75274c50bad336a6bf82e7f48c53f0b161;hb=4c3a1f7de5dcbb96e939c8e10f07aae0d1f8aa70;hp=4de730fa31ef9d7e9e27a84925d60c7cda7473cd;hpb=921811aa482e36b61dc8f4badb55a56c7ff46ee9;p=packages%2Fvtk.git

diff --git a/vtk.spec b/vtk.spec
index 4de730f..e0e1fd7 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -15,17 +15,16 @@
 Summary:	Toolkit for 3D computer graphics, image processing, and visualization
 Summary(pl.UTF-8):	Zestaw narzędzi do trójwymiarowej grafiki, przetwarzania obrazu i wizualizacji
 Name:		vtk
-Version:	6.1.0
+Version:	6.3.0
 Release:	1
 License:	BSD
 Group:		Libraries
-Source0:	http://www.vtk.org/files/release/6.1/VTK-%{version}.tar.gz
-# Source0-md5:	25e4dfb3bad778722dcaec80cd5dab7d
-Source1:	http://www.vtk.org/files/release/6.1/VTKData-%{version}.tar.gz
-# Source1-md5:	f82c8fe151279c0422ab8a6cfe991c94
-Patch0:		%{name}-system-libs.patch
-Patch1:		%{name}-install.patch
-Patch2:		%{name}-chemistry.patch
+Source0:	http://www.vtk.org/files/release/6.3/VTK-%{version}.tar.gz
+# Source0-md5:	0231ca4840408e9dd60af48b314c5b6d
+Source1:	http://www.vtk.org/files/release/6.3/VTKData-%{version}.tar.gz
+# Source1-md5:	b164200226805aeb741703a8168afdda
+Patch0:		%{name}-chemistry.patch
+Patch1:		gdal2.patch
 URL:		http://www.vtk.org/
 %{?with_OSMesa:BuildRequires: Mesa-libOSMesa-devel}
 BuildRequires:	OpenGL-GLX-devel
@@ -64,7 +63,7 @@ BuildRequires:	libtiff-devel
 BuildRequires:	libxml2-devel >= 2
 BuildRequires:	motif-devel
 BuildRequires:	mysql-devel
-BuildRequires:	netcdf-devel >= 4
+BuildRequires:	netcdf-cxx-devel >= 4
 # some code using it exists (Domains/Chemistry), but is not included in cmakefiles
 #BuildRequires:	openqube-devel
 BuildRequires:	perl-base
@@ -72,11 +71,11 @@ BuildRequires:	postgresql-devel
 %{?with_system_proj:BuildRequires:	proj-devel >= 4.3, proj-devel < 4.4}
 BuildRequires:	python-devel >= 2
 BuildRequires:	python-sip-devel
-BuildRequires:	python-PyQt4-devel
 BuildRequires:	qt4-build >= 4.5.0
 BuildRequires:	qt4-qmake >= 4.5.0
 BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRequires:	sip
+BuildRequires:	sip-PyQt4
 BuildRequires:	tcl-devel
 BuildRequires:	tk-devel
 BuildRequires:	unixODBC-devel
@@ -89,6 +88,7 @@ BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	zlib-devel
+BuildConflicts:	libXNVCtrl-devel
 Requires:	gl2ps >= 1.3.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -313,11 +313,10 @@ potrzebne do uruchamiania różnych przykładów z pakietu vtk-examples.
 %setup -q -n VTK-%{version} -b 1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # Replace relative path ../../../VTKData with destination filesystem path
 grep -Erl '(\.\./)+VTKData' Examples | xargs \
-  perl -pi -e 's,(\.\./)+VTKData,%{_datadir}/vtk-6.1,g'
+  perl -pi -e 's,(\.\./)+VTKData,%{_datadir}/vtk-6.3,g'
 
 # Save an unbuilt copy of the Example's sources for %doc
 mkdir vtk-examples
@@ -333,9 +332,10 @@ export CXXFLAGS="%{rpmcxxflags} -D_UNICODE"
 export JAVA_HOME=%{java_home}
 %endif
 
-mkdir build
+mkdir -p build
 cd build
 %cmake .. \
+	-Wno-dev \
 	-DBUILD_DOCUMENTATION:BOOL=ON \
 	-DBUILD_EXAMPLES:BOOL=ON \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -351,7 +351,7 @@ cd build
 	-DTCL_LIBRARY:PATH=%{_libdir}/libtcl.so \
 	-DTK_INCLUDE_PATH:PATH=%{_includedir} \
 	-DTK_LIBRARY:PATH=%{_libdir}/libtk.so \
-	-DVTK_DATA_ROOT:PATH=%{_datadir}/vtk-6.1 \
+	-DVTK_DATA_ROOT:PATH=%{_datadir}/vtk-6.3 \
 	-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
 	-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \
 	-DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
@@ -424,7 +424,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ld.so.conf.d,%{_examplesdir}/%{name}-%
 echo %{_libdir}/vtk > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf
 
 for f in $(cd build/ExternalData/Testing ; find Data -type l); do
-	install -Dp build/ExternalData/Testing/$f $RPM_BUILD_ROOT%{_datadir}/vtk-6.1/$f
+	install -Dp build/ExternalData/Testing/$f $RPM_BUILD_ROOT%{_datadir}/vtk-6.3/$f
 done
 
 # Install utilities
@@ -489,7 +489,7 @@ install build/bin/VTKJavaExecutable $RPM_BUILD_ROOT%{_bindir}
 install build/bin/vtkpython $RPM_BUILD_ROOT%{_bindir}
 
 # unwanted doxygen files and misplaced verdict docs
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/vtk-6.1/{doxygen,verdict}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/vtk-6.3/{doxygen,verdict}
 
 # only *.pyc are built by default, add *.pyo
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/vtk
@@ -515,7 +515,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.html vtkLogo.jpg vtkBanner.gif Wrapping/Tools/README*
+%doc README.md vtkLogo.jpg vtkBanner.gif Wrapping/Tools/README*
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf
 %dir %{_libdir}/vtk
 %attr(755,root,root) %{_libdir}/vtk/libvtkChartsCore.so.1
@@ -532,10 +532,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtkParallelCore.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingAnnotation.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContext2D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContextOpenGL.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingCore.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingFreeType.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingFreeTypeFontConfig.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingFreeTypeOpenGL.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingGL2PS.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingImage.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingLIC.so.1
@@ -544,7 +544,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingOpenGL.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingParallel.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolume.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeAMR.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeOpenGL.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkTesting*.so.1
 %attr(755,root,root) %{_libdir}/vtk/libvtkVPIC.so.1
@@ -588,10 +587,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtkParallelCore.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingAnnotation.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContext2D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingContextOpenGL.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingCore.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingFreeType.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingFreeTypeFontConfig.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingFreeTypeOpenGL.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingGL2PS.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingImage.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingLIC.so
@@ -600,7 +599,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingOpenGL.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingParallel.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolume.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeAMR.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingVolumeOpenGL.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkTesting*.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkVPIC.so
@@ -626,7 +624,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/vtk/VPIC
 %{_includedir}/vtk/DICOM*.h
 %{_includedir}/vtk/DatabaseSchemaWith2Tables.h
-%{_includedir}/vtk/LSDyna*.h
 %{_includedir}/vtk/alglib
 %{_includedir}/vtk/vtklibproj4
 %{_includedir}/vtk/vtkmetaio
@@ -719,7 +716,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vtk/libvtkPythonInterpreter.so.1
 # RenderingMatplotlib requires PythonInterpreter
 %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingMatplotlib.so.1
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonTkWidgets-6.1.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonTkWidgets-6.3.so
 %attr(755,root,root) %{_libdir}/vtk/libvtkWrappingPython2?Core.so.1
 %dir %{py_sitedir}/vtk
 %{py_sitedir}/vtk/*.py[co]
@@ -818,6 +815,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files data
 %defattr(644,root,root,755)
-%dir %{_datadir}/vtk-6.1
-%{_datadir}/vtk-6.1/Data
-%{_datadir}/vtk-6.1/vtkDomainsChemistry
+%dir %{_datadir}/vtk-6.3
+%{_datadir}/vtk-6.3/Data
+%{_datadir}/vtk-6.3/vtkDomainsChemistry