From 3d9534218ac0d208140947b9f5c769e2c5613b56 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 8 Apr 2013 12:11:50 -0600 Subject: [PATCH 01/30] Initial 6.0.0 test --- vtk-5.2.0-gcc43.patch | 33 --------------------------------- vtk-5.6.1-system.patch | 26 -------------------------- vtk-6.0.0-system.patch | 29 +++++++++++++++++++++++++++++ vtk-soname.patch | 11 ----------- vtk.spec | 10 +++++----- 5 files changed, 34 insertions(+), 75 deletions(-) delete mode 100644 vtk-5.2.0-gcc43.patch delete mode 100644 vtk-5.6.1-system.patch create mode 100644 vtk-6.0.0-system.patch delete mode 100644 vtk-soname.patch diff --git a/vtk-5.2.0-gcc43.patch b/vtk-5.2.0-gcc43.patch deleted file mode 100644 index 5f9a0b4..0000000 --- a/vtk-5.2.0-gcc43.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- VTK/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2008-03-19 21:22:17.000000000 +0100 -+++ VTK/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-10-05 11:46:08.000000000 +0200 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #if defined(__BORLANDC__) ---- VTK/Utilities/DICOMParser/DICOMFile.cxx.gcc43 2008-03-19 21:22:17.000000000 +0100 -+++ VTK/Utilities/DICOMParser/DICOMFile.cxx 2008-10-05 11:46:02.000000000 +0200 -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - - DICOMFile::DICOMFile() : InputStream() - { ---- VTK/Utilities/DICOMParser/DICOMParser.cxx.gcc43 2008-07-21 19:03:03.000000000 +0200 -+++ VTK/Utilities/DICOMParser/DICOMParser.cxx 2008-10-05 11:45:56.000000000 +0200 -@@ -40,7 +40,7 @@ - #endif - - #include --#include -+#include - - // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr - // #define DEBUG_DICOM diff --git a/vtk-5.6.1-system.patch b/vtk-5.6.1-system.patch deleted file mode 100644 index 5d44c35..0000000 --- a/vtk-5.6.1-system.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt ---- VTK/CMakeLists.txt.system 2010-09-27 14:40:00.000000000 -0600 -+++ VTK/CMakeLists.txt 2011-02-08 14:08:29.367122550 -0700 -@@ -106,6 +106,11 @@ IF(CMAKE_CONFIGURATION_TYPES) - ENDIF(CMAKE_CONFIGURATION_TYPES) - - #----------------------------------------------------------------------------- -+# Do we try to use system libraries by default? -+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF) -+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES) -+ -+#----------------------------------------------------------------------------- - # Load some macros. - INCLUDE(vtkDependentOption) - INCLUDE(vtkThirdParty) -diff -up VTK/CMake/vtkThirdParty.cmake.system VTK/CMake/vtkThirdParty.cmake ---- VTK/CMake/vtkThirdParty.cmake.system 2010-09-27 14:40:00.000000000 -0600 -+++ VTK/CMake/vtkThirdParty.cmake 2011-02-08 14:07:46.424662568 -0700 -@@ -1,6 +1,6 @@ - #----------------------------------------------------------------------------- - MACRO(VTK_THIRD_PARTY_OPTION upper lower) -- OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." OFF) -+ OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." ${VTK_USE_SYSTEM_LIBRARIES}) - MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper}) - IF(VTK_USE_SYSTEM_${upper}) - IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake) diff --git a/vtk-6.0.0-system.patch b/vtk-6.0.0-system.patch new file mode 100644 index 0000000..5246ece --- /dev/null +++ b/vtk-6.0.0-system.patch @@ -0,0 +1,29 @@ +diff --git a/CMake/vtkModuleMacros.cmake b/CMake/vtkModuleMacros.cmake +index 3e746a6..9ef38fd 100644 +--- a/CMake/vtkModuleMacros.cmake ++++ b/CMake/vtkModuleMacros.cmake +@@ -563,7 +563,7 @@ macro(vtk_module_third_party _pkg) + message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") + endif() + +- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF) ++ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES}) + mark_as_advanced(VTK_USE_SYSTEM_${_upper}) + + if(VTK_USE_SYSTEM_${_upper}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0d1dda8..b3e1801 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_INSTALL_INCLUDE_DIR}) + set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen) + + #----------------------------------------------------------------------------- ++# Do we try to use system libraries by default? ++OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF) ++MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES) ++ ++#----------------------------------------------------------------------------- + # The third party macros are still used in one or two third party builds. + include(vtkThirdParty) + diff --git a/vtk-soname.patch b/vtk-soname.patch deleted file mode 100644 index 812020f..0000000 --- a/vtk-soname.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up VTK/Utilities/vtknetcdf/CMakeLists.txt.soname VTK/Utilities/vtknetcdf/CMakeLists.txt ---- VTK/Utilities/vtknetcdf/CMakeLists.txt.soname 2012-05-12 05:59:27.000000000 -0600 -+++ VTK/Utilities/vtknetcdf/CMakeLists.txt 2012-05-24 11:49:32.069811561 -0600 -@@ -350,6 +350,7 @@ TARGET_LINK_LIBRARIES(vtkNetCDF_cxx vtkN - # Apply user-defined properties to the library target. - IF(VTK_LIBRARY_PROPERTIES) - SET_TARGET_PROPERTIES(vtkNetCDF PROPERTIES ${VTK_LIBRARY_PROPERTIES}) -+ SET_TARGET_PROPERTIES(vtkNetCDF_cxx PROPERTIES ${VTK_LIBRARY_PROPERTIES}) - ENDIF(VTK_LIBRARY_PROPERTIES) - - #----------------------------------------------------------------------------- diff --git a/vtk.spec b/vtk.spec index 552ab5f..37f0a54 100644 --- a/vtk.spec +++ b/vtk.spec @@ -11,8 +11,8 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 5.10.1 -Release: 4%{?dist} +Version: 6.0.0 +Release: 0.1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -25,7 +25,7 @@ Patch1: vtk-5.2.0-gcc43.patch Patch2: vtk-soname.patch # Use system libraries # http://public.kitware.com/Bug/view.php?id=11823 -Patch5: vtk-5.6.1-system.patch +Patch5: vtk-6.0.0-system.patch URL: http://vtk.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -142,8 +142,8 @@ programming languages. %prep %setup -q -n VTK%{version} -%patch1 -p1 -b .gcc43 -%patch2 -p1 -b .soname +#patch1 -p1 -b .gcc43 +#patch2 -p1 -b .soname %patch5 -p1 -b .system # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} From 3d248953fcaefee95ec7ab6c986231750a21a052 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 May 2013 12:45:46 -0600 Subject: [PATCH 02/30] Rebuild for hdf5 1.8.11 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 552ab5f..79af479 100644 --- a/vtk.spec +++ b/vtk.spec @@ -12,7 +12,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 5.10.1 -Release: 4%{?dist} +Release: 5%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -413,6 +413,9 @@ rm -rf %{buildroot} %doc vtk-examples/Examples %changelog +* Thu May 16 2013 Orion Poplawski - 5.10.1-5 +- Rebuild for hdf5 1.8.11 + * Fri Feb 15 2013 Fedora Release Engineering - 5.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 980ace4171b97e469bd2c1ca6b3b6940408d8414 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 26 Jun 2013 10:05:46 -0600 Subject: [PATCH 03/30] Initial 6.0 rc2 update and cleanup --- vtk.spec | 148 +++++++++++++++++++++++++------------------------------ 1 file changed, 67 insertions(+), 81 deletions(-) diff --git a/vtk.spec b/vtk.spec index 00f3dd7..8ff059b 100644 --- a/vtk.spec +++ b/vtk.spec @@ -7,28 +7,27 @@ %else %bcond_without java %endif -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} +%{!?tcl_sitelib: %global tcl_sitelib %{_datadir}/tcl%{tcl_version}} Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 0.1%{?dist} +Release: 0.1.rc2%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant License: BSD Group: System Environment/Libraries -Source: http://www.vtk.org/files/release/5.10/%{name}-%{version}.tar.gz -Patch1: vtk-5.2.0-gcc43.patch -# Add soname to libvtkNetCDF_cxx -# http://vtk.org/Bug/view.php?id=12207 -Patch2: vtk-soname.patch +Source: http://www.vtk.org/files/release/6.0/%{name}-%{version}.rc2.tar.gz # Use system libraries # http://public.kitware.com/Bug/view.php?id=11823 Patch5: vtk-6.0.0-system.patch +# Test +Patch6: vtk-test.patch URL: http://vtk.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if 0%{?rhel} && (0%{?rhel} <= 6) BuildRequires: cmake28 @@ -62,10 +61,13 @@ BuildRequires: %{_includedir}/Xm %{!?with_java:Conflicts: vtk-java} Requires: hdf5 = %{_hdf5_version} +# Do not check .so files in the python_sitearch directory +%global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ + %description VTK is an open-source software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many -advanced algorithms (e.g., surface reconstruction, implicit modelling, +advanced algorithms (e.g., surface reconstruction, implicit modeling, decimation) and rendering techniques (e.g., hardware-accelerated volume rendering, LOD control). @@ -73,6 +75,7 @@ volume rendering, LOD control). Summary: VTK header files for building C++ code Requires: vtk = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel} +Requires: cmake Requires: gl2ps-devel Requires: expat-devel, libjpeg-devel, libpng-devel Requires: libogg-devel @@ -85,7 +88,7 @@ Group: Development/Libraries %description devel This provides the VTK header files required to compile C++ programs that -use VTK to do 3D visualisation. +use VTK to do 3D visualization. %package tcl Summary: Tcl bindings for VTK @@ -141,10 +144,9 @@ programming languages. %prep -%setup -q -n VTK%{version} -#patch1 -p1 -b .gcc43 -#patch2 -p1 -b .soname +%setup -q -n VTK%{version}.rc2 %patch5 -p1 -b .system +%patch6 -p1 -b .test # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} # otherwise it will break on symlinks. @@ -155,7 +157,7 @@ grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \ mkdir vtk-examples cp -a Examples vtk-examples # Don't ship Win32 examples -rm -rf vtk-examples/Examples/GUI/Win32 +rm -r vtk-examples/Examples/GUI/Win32 find vtk-examples -type f | xargs chmod -R a-x %build @@ -175,9 +177,12 @@ pushd build -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=ON \ - -DVTK_INSTALL_INCLUDE_DIR:PATH=/include/vtk \ - -DVTK_INSTALL_LIB_DIR:PATH=/%{_lib}/vtk \ - -DVTK_INSTALL_QT_DIR=/%{_lib}/qt4/plugins/designer \ + -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ + -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \ + -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \ + -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \ + -DVTK_INSTALL_QT_DIR:PATH=/%{_lib}/qt4/plugins/designer \ + -DVTK_INSTALL_TCL_DIR:PATH=share/tcl%{tcl_version}/vtk \ -DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \ %if %{with OSMesa} -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ @@ -193,19 +198,21 @@ pushd build -DVTK_WRAP_JAVA:BOOL=OFF \ %endif -DVTK_WRAP_TCL:BOOL=ON \ - -DVTK_USE_BOOST:BOOL=ON \ - -DVTK_USE_GL2PS:BOOL=ON \ - -DVTK_USE_GUISUPPORT:BOOL=ON \ - -DVTK_USE_MYSQL=ON \ + -DVTK_Group_Imaging:BOOL=ON \ + -DVTK_Group_Qt:BOOL=ON \ + -DVTK_Group_Rendering:BOOL=ON \ + -DVTK_Group_StandAlone:BOOL=ON \ + -DVTK_Group_Tk:BOOL=ON \ + -DVTK_Group_Views:BOOL=ON \ + -DModule_vtkFiltersStatisticsGnuR:BOOL=ON \ -DVTK_USE_OGGTHEORA_ENCODER=ON \ - -DVTK_USE_PARALLEL:BOOL=ON \ - -DVTK_USE_POSTGRES=ON \ -DVTK_USE_SYSTEM_LIBRARIES=ON \ - -DVTK_USE_SYSTEM_LIBPROJ4=OFF \ - -DVTK_USE_QVTK=ON \ - -DVTK_USE_QT=ON \ - -DVTK_USE_TEXT_ANALYSIS=ON + -DVTK_USE_SYSTEM_LIBPROJ4=OFF +# TODO - MPI +#-DVTK_Group_MPI:BOOL=ON \ +# Needed for some tests. Fails to compile at the moment. We don't run test though. +# -DVTK_DATA_ROOT:PATH=%{_datadir}/vtkdata-%{version} \ # Not working, see http://public.kitware.com/Bug/view.php?id=11978 # -DVTK_USE_ODBC=ON \ # Not working, see http://public.kitware.com/Bug/view.php?id=10779 @@ -215,14 +222,13 @@ pushd build # -DVTK_USE_MPI:BOOL=ON \ # Got intermittent build error with -j -make #%{?_smp_mflags} +make %{?_smp_mflags} # Remove executable bits from sources (some of which are generated) find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or \ -name \*.gif | xargs chmod -x %install -rm -rf %{buildroot} mkdir -p %{buildroot} pushd build make install DESTDIR=%{buildroot} @@ -243,7 +249,6 @@ ls %{buildroot}%{_libdir}/vtk/*.so.* \ # List of executable utilities cat > utils.list << EOF vtkEncodeString -lproj EOF # List of executable examples @@ -270,44 +275,33 @@ Cone5 Cone6 EOF -# List of executable test binaries -cat > testing.list << EOF -CommonCxxTests -TestCxxFeatures -TestInstantiator -FilteringCxxTests -GraphicsCxxTests -GenericFilteringCxxTests -ImagingCxxTests -IOCxxTests -RenderingCxxTests -VTKBenchMark -VolumeRenderingCxxTests -WidgetsCxxTests -SocketClient -SocketServer -EOF - -# Install utils/examples/testing, too -for filelist in utils.list examples.list testing.list; do +# Install examples too +for filelist in examples.list; do for file in `cat $filelist`; do install -p bin/$file %{buildroot}%{_bindir} done +done + +# Fix up filelist paths +for filelist in utils.list examples.list; do perl -pi -e's,^,%{_bindir}/,' $filelist done -# Remove any remnants of rpaths -for file in `cat utils.list examples.list testing.list`; do +# Remove any remnants of rpaths on files we install +for file in `cat examples.list`; do chrpath -d %{buildroot}$file done +# http://vtk.org/Bug/view.php?id=14125 +chrpath -d %{buildroot}%{python_sitearch}/vtk/*.so + # Main package contains utils and core libs cat libs.list utils.list > main.list popd # Make scripts executable -chmod a+x %{buildroot}%{_libdir}/vtk/doxygen/*.pl -chmod a+x %{buildroot}%{_libdir}/vtk/testing/*.{py,tcl} +#chmod a+x %{buildroot}%{_libdir}/vtk/doxygen/*.pl +#chmod a+x %{buildroot}%{_libdir}/vtk/testing/*.{py,tcl} # Remove exec bit from non-scripts and %%doc for file in `find %{buildroot} -type f -perm 0755 \ @@ -320,9 +314,6 @@ find Utilities/Upgrading -type f | xargs chmod -x # Add exec bits to shared libs ... chmod 0755 %{buildroot}%{_libdir}/python*/site-packages/vtk/*.so -# Verdict places the docs in the false folder -rm -fr %{buildroot}%{_libdir}/vtk/doc - # Setup Wrapping docs tree mkdir _docs cp -pr --parents Wrapping/*/README* _docs/ @@ -331,8 +322,6 @@ cp -pr --parents Wrapping/*/README* _docs/ %check #LD_LIBARARY_PATH=`pwd`/bin ctest -V -%clean -rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -357,62 +346,59 @@ rm -rf %{buildroot} %postun qt -p /sbin/ldconfig %files -f build/main.list -%defattr(-,root,root,-) %doc Copyright.txt README.html vtkLogo.jpg vtkBanner.gif _docs/Wrapping %config(noreplace) %{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf +%dir %{_libdir}/vtk %files devel -%defattr(-,root,root,-) %doc Utilities/Upgrading +%{_bindir}/vtkHashSource %{_bindir}/vtkWrapHierarchy -%{_libdir}/vtk/doxygen %{_includedir}/vtk %{_libdir}/vtk/*.so -%{_libdir}/vtk/CMake -%{_libdir}/vtk/*.cmake -%{_libdir}/vtk/hints +%{_libdir}/libvtkWrappingTools.a +%{_libdir}/cmake/vtk/ +%{_bindir}/vtkParseOGLExt +%{_bindir}/vtkProcessShader +%{_docdir}/vtk-6.0/ +%{tcl_sitelib}/vtk/vtktcl.c %files tcl -%defattr(-,root,root,-) %{_libdir}/vtk/*TCL.so.* %{_bindir}/vtk %{_bindir}/vtkWrapTcl %{_bindir}/vtkWrapTclInit -%{_libdir}/vtk/pkgIndex.tcl -%{_libdir}/vtk/tcl +%{tcl_sitelib}/vtk/ +%exclude %{tcl_sitelib}/vtk/vtktcl.c %files python -%defattr(-,root,root,-) -#%{python_sitearch}/vtk %{python_sitearch}/* -%{_libdir}/vtk/*PythonD.so.* -%{_bindir}/vtkpython +%{_libdir}/vtk/*Python27D.so.* +#%{_bindir}/vtkpython %{_bindir}/vtkWrapPython %{_bindir}/vtkWrapPythonInit %if %{with java} %files java -%defattr(-,root,root,-) %{_libdir}/vtk/*Java.so.* -%{_libdir}/vtk/java +%{_libdir}/vtk/vtk.jar %{_bindir}/vtkParseJava %{_bindir}/vtkWrapJava %endif %files qt -%defattr(-,root,root,-) -%{_libdir}/vtk/libQVTK.so.* -%{_libdir}/qt4/plugins/designer +%{_libdir}/vtk/lib*Qt*.so.* +%{_libdir}/qt4/plugins/designer/libQVTKWidgetPlugin.so -%files testing -f build/testing.list -%defattr(-,root,root,-) -%{_libdir}/vtk/testing +%files testing %files examples -f build/examples.list -%defattr(-,root,root,-) %doc vtk-examples/Examples %changelog +* Mon Jun 10 2013 Orion Poplawski - 6.0.0-1 +- Update to 6.0.0 + * Thu May 16 2013 Orion Poplawski - 5.10.1-5 - Rebuild for hdf5 1.8.11 From 5eec0fecbb806347ec53d62dee93834c3aab49e8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 27 Jun 2013 10:40:29 -0600 Subject: [PATCH 04/30] Update to 6.0.0 final --- vtk.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/vtk.spec b/vtk.spec index 8ff059b..17c05cd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,18 +14,16 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 0.1.rc2%{?dist} +Release: 1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant License: BSD Group: System Environment/Libraries -Source: http://www.vtk.org/files/release/6.0/%{name}-%{version}.rc2.tar.gz +Source: http://www.vtk.org/files/release/6.0/%{name}-%{version}.tar.gz # Use system libraries # http://public.kitware.com/Bug/view.php?id=11823 Patch5: vtk-6.0.0-system.patch -# Test -Patch6: vtk-test.patch URL: http://vtk.org/ @@ -144,9 +142,8 @@ programming languages. %prep -%setup -q -n VTK%{version}.rc2 +%setup -q -n VTK%{version} %patch5 -p1 -b .system -%patch6 -p1 -b .test # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} # otherwise it will break on symlinks. @@ -396,7 +393,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog -* Mon Jun 10 2013 Orion Poplawski - 6.0.0-1 +* Thu Jun 27 2013 Orion Poplawski - 6.0.0-1 - Update to 6.0.0 * Thu May 16 2013 Orion Poplawski - 5.10.1-5 From e027f584aa70b239064939b1888d5a6796779023 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 28 Jun 2013 13:09:38 -0600 Subject: [PATCH 05/30] Add qt-tcl, qt-python sub-packages, install vtkpython --- vtk.spec | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index 17c05cd..bcf3322 100644 --- a/vtk.spec +++ b/vtk.spec @@ -122,6 +122,22 @@ Group: System Environment/Libraries %description qt Qt bindings for VTK +%package qt-python +Summary: Qt Python bindings for VTK +Requires: vtk = %{version}-%{release} +Group: System Environment/Libraries + +%description qt-python +Qt Python bindings for VTK + +%package qt-tcl +Summary: Qt TCL bindings for VTK +Requires: vtk = %{version}-%{release} +Group: System Environment/Libraries + +%description qt-tcl +Qt TCL bindings for VTK + %package testing Summary: Testing programs for VTK Requires: vtk = %{version}-%{release}, vtkdata = %{version} @@ -241,7 +257,7 @@ echo %{_libdir}/vtk > %{buildroot}%{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf # Gather list of non-python/tcl libraries ls %{buildroot}%{_libdir}/vtk/*.so.* \ - | grep -Ev '(Java|QVTK|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list + | grep -Ev '(Java|Qt|Python27D|TCL)' | sed -e's,^%{buildroot},,' > libs.list # List of executable utilities cat > utils.list << EOF @@ -289,6 +305,10 @@ for file in `cat examples.list`; do chrpath -d %{buildroot}$file done +# vtkpython is not being installed +cp -p bin/vtkpython %{buildroot}%{_bindir}/ +chrpath -d %{buildroot}%{_bindir}/vtkpython + # http://vtk.org/Bug/view.php?id=14125 chrpath -d %{buildroot}%{python_sitearch}/vtk/*.so @@ -342,6 +362,14 @@ cp -pr --parents Wrapping/*/README* _docs/ %postun qt -p /sbin/ldconfig +%post qt-python -p /sbin/ldconfig + +%postun qt-python -p /sbin/ldconfig + +%post qt-tcl -p /sbin/ldconfig + +%postun qt-tcl -p /sbin/ldconfig + %files -f build/main.list %doc Copyright.txt README.html vtkLogo.jpg vtkBanner.gif _docs/Wrapping %config(noreplace) %{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf @@ -362,6 +390,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %files tcl %{_libdir}/vtk/*TCL.so.* +%exclude %{_libdir}/vtk/*QtTCL.so.* %{_bindir}/vtk %{_bindir}/vtkWrapTcl %{_bindir}/vtkWrapTclInit @@ -371,7 +400,8 @@ cp -pr --parents Wrapping/*/README* _docs/ %files python %{python_sitearch}/* %{_libdir}/vtk/*Python27D.so.* -#%{_bindir}/vtkpython +%exclude %{_libdir}/vtk/*QtPython27D.so.* +%{_bindir}/vtkpython %{_bindir}/vtkWrapPython %{_bindir}/vtkWrapPythonInit @@ -385,8 +415,16 @@ cp -pr --parents Wrapping/*/README* _docs/ %files qt %{_libdir}/vtk/lib*Qt*.so.* +%exclude %{_libdir}/vtk/*TCL.so.* +%exclude %{_libdir}/vtk/*Python27D.so.* %{_libdir}/qt4/plugins/designer/libQVTKWidgetPlugin.so +%files qt-python +%{_libdir}/vtk/*QtPython27D.so.* + +%files qt-tcl +%{_libdir}/vtk/*QtTCL.so.* + %files testing %files examples -f build/examples.list From 00efa13061b4192f69fea57f9388f0aa725e6048 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 28 Jun 2013 13:21:40 -0600 Subject: [PATCH 06/30] Upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dae8953..528f940 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ vtk-5.6.0.tar.gz /vtk-5.8.0.tar.gz /vtk-5.10.0.tar.gz /vtk-5.10.1.tar.gz +/vtk-6.0.0.tar.gz diff --git a/sources b/sources index 7890c3a..e4c58d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -264b0052e65bd6571a84727113508789 vtk-5.10.1.tar.gz +72ede4812c90bdc55172702f0cad02bb vtk-6.0.0.tar.gz From 354ba92a1d8d9d0a670b530991cb165a624f8659 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 1 Jul 2013 09:33:55 -0600 Subject: [PATCH 07/30] Set VTK_INSTALL_ARCHIVE_DIR for proper install location for libvtkWrappingTools.a --- vtk.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index bcf3322..20715a4 100644 --- a/vtk.spec +++ b/vtk.spec @@ -191,6 +191,7 @@ pushd build -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=ON \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ + -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \ @@ -246,9 +247,10 @@ mkdir -p %{buildroot} pushd build make install DESTDIR=%{buildroot} +# Move python libraries into the proper location if [ "%{_lib}" != lib -a "`ls %{buildroot}%{_prefix}/lib/*`" != "" ]; then mkdir -p %{buildroot}%{_libdir} - mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/ + mv %{buildroot}%{_prefix}/lib/python* %{buildroot}%{_libdir}/ fi # ld config @@ -381,7 +383,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %{_bindir}/vtkWrapHierarchy %{_includedir}/vtk %{_libdir}/vtk/*.so -%{_libdir}/libvtkWrappingTools.a +%{_libdir}/vtk/libvtkWrappingTools.a %{_libdir}/cmake/vtk/ %{_bindir}/vtkParseOGLExt %{_bindir}/vtkProcessShader From dff75e287e14187b4e9788a954358205052099c8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 1 Jul 2013 09:36:36 -0600 Subject: [PATCH 08/30] Add vtk-install patch to install needed cmake files --- vtk-install.patch | 15 +++++++++++++++ vtk.spec | 8 ++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 vtk-install.patch diff --git a/vtk-install.patch b/vtk-install.patch new file mode 100644 index 0000000..e455575 --- /dev/null +++ b/vtk-install.patch @@ -0,0 +1,15 @@ +diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.cmake +--- VTK6.0.0/CMake/vtkModuleTop.cmake.install 2013-06-12 13:47:10.000000000 -0600 ++++ VTK6.0.0/CMake/vtkModuleTop.cmake 2013-06-28 16:12:02.837198769 -0600 +@@ -330,9 +330,11 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) + CMake/pythonmodules.h.in + CMake/UseVTK.cmake + CMake/FindTCL.cmake ++ CMake/TopologicalSort.cmake + CMake/vtkTclTkMacros.cmake + CMake/vtk-forward.c.in + CMake/vtkForwardingExecutable.cmake ++ CMake/vtkGroups.cmake + CMake/vtkJavaWrapping.cmake + CMake/vtkModuleAPI.cmake + CMake/vtkModuleHeaders.cmake.in diff --git a/vtk.spec b/vtk.spec index 20715a4..1134ce2 100644 --- a/vtk.spec +++ b/vtk.spec @@ -23,7 +23,10 @@ Group: System Environment/Libraries Source: http://www.vtk.org/files/release/6.0/%{name}-%{version}.tar.gz # Use system libraries # http://public.kitware.com/Bug/view.php?id=11823 -Patch5: vtk-6.0.0-system.patch +Patch0: vtk-6.0.0-system.patch +# Install some more needed cmake files to try to support paraview build +# http://www.vtk.org/Bug/view.php?id=14157 +Patch1: vtk-install.patch URL: http://vtk.org/ @@ -159,7 +162,8 @@ programming languages. %prep %setup -q -n VTK%{version} -%patch5 -p1 -b .system +%patch0 -p1 -b .system +%patch1 -p1 -b .install # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} # otherwise it will break on symlinks. From f4b9efa331be361c53dfeeb6b42ec807f8ee2ac5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 12 Jul 2013 11:56:49 -0600 Subject: [PATCH 09/30] Add BR on R-devel --- vtk.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vtk.spec b/vtk.spec index 1134ce2..e9aa07e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -57,6 +57,7 @@ BuildRequires: hdf5-devel BuildRequires: libtheora-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel +BuildRequires: R-devel BuildRequires: wget BuildRequires: %{_includedir}/Xm %{!?with_java:Conflicts: vtk-java} @@ -437,6 +438,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Fri Jul 12 2013 Orion Poplawski - 6.0.0-1 +- Add BR on R-devel + * Thu Jun 27 2013 Orion Poplawski - 6.0.0-1 - Update to 6.0.0 From 8bd4eb97feccfe15d38124178832db0d6e7c6367 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 15 Jul 2013 09:50:20 -0600 Subject: [PATCH 10/30] Install vtkMakeInstantiator files for gdcm build --- vtk-install.patch | 8 ++++++-- vtk.spec | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/vtk-install.patch b/vtk-install.patch index e455575..a97755a 100644 --- a/vtk-install.patch +++ b/vtk-install.patch @@ -1,7 +1,7 @@ diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.cmake --- VTK6.0.0/CMake/vtkModuleTop.cmake.install 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/CMake/vtkModuleTop.cmake 2013-06-28 16:12:02.837198769 -0600 -@@ -330,9 +330,11 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) ++++ VTK6.0.0/CMake/vtkModuleTop.cmake 2013-07-12 16:15:15.706008475 -0600 +@@ -330,10 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) CMake/pythonmodules.h.in CMake/UseVTK.cmake CMake/FindTCL.cmake @@ -11,5 +11,9 @@ diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.c CMake/vtkForwardingExecutable.cmake + CMake/vtkGroups.cmake CMake/vtkJavaWrapping.cmake ++ CMake/vtkMakeInstantiator.cmake ++ CMake/vtkMakeInstantiator.cxx.in ++ CMake/vtkMakeInstantiator.h.in CMake/vtkModuleAPI.cmake CMake/vtkModuleHeaders.cmake.in + CMake/vtkModuleInfo.cmake.in diff --git a/vtk.spec b/vtk.spec index e9aa07e..c2a2f53 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 1%{?dist} +Release: 2%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -438,6 +438,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Mon Jul 15 2013 Orion Poplawski - 6.0.0-2 +- Install vtkMakeInstantiator files for gdcm build + * Fri Jul 12 2013 Orion Poplawski - 6.0.0-1 - Add BR on R-devel From 505299507240989bcccfc3f4481e558cf0c1dfda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 16:20:00 +0200 Subject: [PATCH 11/30] Perl 5.18 rebuild --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index c2a2f53..fd1d4b9 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 2%{?dist} +Release: 3%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -438,6 +438,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Wed Jul 17 2013 Petr Pisar - 6.0.0-3 +- Perl 5.18 rebuild + * Mon Jul 15 2013 Orion Poplawski - 6.0.0-2 - Install vtkMakeInstantiator files for gdcm build From e1ead84e8a03d48dea625abf55b72d44a0611ff7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 26 Jul 2013 16:43:04 -0600 Subject: [PATCH 12/30] Drop old comment about VTK_USE_GNUR --- vtk.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index fd1d4b9..f276caa 100644 --- a/vtk.spec +++ b/vtk.spec @@ -234,8 +234,6 @@ pushd build # -DVTK_DATA_ROOT:PATH=%{_datadir}/vtkdata-%{version} \ # Not working, see http://public.kitware.com/Bug/view.php?id=11978 # -DVTK_USE_ODBC=ON \ -# Not working, see http://public.kitware.com/Bug/view.php?id=10779 -# -DVTK_USE_GNU_R:BOOL=ON \ # Commented old flags in case we'd like to reactive some of them # -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests # -DVTK_USE_MPI:BOOL=ON \ From 4553fdbc55cf8c08f5f3d9f6ab59b41cdf75c483 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 26 Jul 2013 16:47:48 -0600 Subject: [PATCH 13/30] Add patch to install vtkpython --- vtk.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/vtk.spec b/vtk.spec index f276caa..8f40895 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 3%{?dist} +Release: 4%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -27,6 +27,8 @@ Patch0: vtk-6.0.0-system.patch # Install some more needed cmake files to try to support paraview build # http://www.vtk.org/Bug/view.php?id=14157 Patch1: vtk-install.patch +# Upsream patch to install vtkpython +Patch2: vtk-vtkpython.patch URL: http://vtk.org/ @@ -165,6 +167,7 @@ programming languages. %setup -q -n VTK%{version} %patch0 -p1 -b .system %patch1 -p1 -b .install +%patch2 -p1 -b .vtkpython # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} # otherwise it will break on symlinks. @@ -310,10 +313,6 @@ for file in `cat examples.list`; do chrpath -d %{buildroot}$file done -# vtkpython is not being installed -cp -p bin/vtkpython %{buildroot}%{_bindir}/ -chrpath -d %{buildroot}%{_bindir}/vtkpython - # http://vtk.org/Bug/view.php?id=14125 chrpath -d %{buildroot}%{python_sitearch}/vtk/*.so @@ -436,6 +435,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Fri Jul 26 2013 Orion Poplawski - 6.0.0-4 +- Add patch to install vtkpython + * Wed Jul 17 2013 Petr Pisar - 6.0.0-3 - Perl 5.18 rebuild From 7aa000a6a2b890b08dea6e0365ff85280f803773 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 29 Jul 2013 20:44:42 -0600 Subject: [PATCH 14/30] Add vtk-vtkpython.patch --- vtk-vtkpython.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 vtk-vtkpython.patch diff --git a/vtk-vtkpython.patch b/vtk-vtkpython.patch new file mode 100644 index 0000000..f310479 --- /dev/null +++ b/vtk-vtkpython.patch @@ -0,0 +1,12 @@ +diff -up VTK6.0.0/Wrapping/Python/CMakeLists.txt.vtkpython VTK6.0.0/Wrapping/Python/CMakeLists.txt +--- VTK6.0.0/Wrapping/Python/CMakeLists.txt.vtkpython 2013-06-12 13:47:10.000000000 -0600 ++++ VTK6.0.0/Wrapping/Python/CMakeLists.txt 2013-07-26 16:44:19.954295281 -0600 +@@ -371,3 +371,8 @@ endif() + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in + ${CMAKE_CURRENT_BINARY_DIR}/setup.py @ONLY IMMEDIATE) ++ ++if(NOT VTK_INSTALL_NO_RUNTIME AND NOT VTK_INSTALL_NO_PYTHON) ++ install(TARGETS vtkpython ${VTKPYTHON_EXECUTABLE} ++ DESTINATION ${VTK_INSTALL_RUNTIME_DIR}) ++endif() From 92ef0bfe5112d7b93303b33114beebeaddcb4afb Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 30 Jul 2013 14:54:48 +0200 Subject: [PATCH 15/30] Rebuild for boost 1.54.0 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index ea0631d..8746dbc 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 5%{?dist} +Release: 6%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -439,6 +439,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Tue Jul 30 2013 Petr Machata - 6.0.0-6 +- Rebuild for boost 1.54.0 + * Mon Jul 29 2013 Orion Poplawski - 6.0.0-5 - Enable VTK_WRAP_PYTHON_SIP From 5c20f1a225bed0c80a60f59982d9434653a059db Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:30:46 -0500 Subject: [PATCH 16/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 8746dbc..d49399e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 6%{?dist} +Release: 7%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -439,6 +439,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 6.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 30 2013 Petr Machata - 6.0.0-6 - Rebuild for boost 1.54.0 From 652f0372b840c25ca581f6916f4fa5d6ba5f8767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= Date: Sun, 22 Dec 2013 14:43:02 +0100 Subject: [PATCH 17/30] vtk.spec --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d49399e..4fac98a 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 7%{?dist} +Release: 8%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -439,6 +439,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Sun Dec 22 2013 François Cami - 6.0.0-8 +* Rebuild for rawhide. + * Sun Aug 04 2013 Fedora Release Engineering - 6.0.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d5d33e85132693dece9cc48f9c38b39b70ecfd41 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 22 Dec 2013 09:17:49 -0700 Subject: [PATCH 18/30] Add BuildRequires on blas-devel and lapack-devel --- vtk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 4fac98a..525a308 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 8%{?dist} +Release: 9%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -64,6 +64,8 @@ BuildRequires: PyQt4-devel BuildRequires: sip-devel BuildRequires: wget BuildRequires: %{_includedir}/Xm +BuildRequires: blas-devel +BuildRequires: lapack-devel %{!?with_java:Conflicts: vtk-java} Requires: hdf5 = %{_hdf5_version} @@ -439,6 +441,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Sun Dec 22 2013 Kevin Fenzi 6.0.0-9 +- Add BuildRequires on blas-devel and lapack-devel + * Sun Dec 22 2013 François Cami - 6.0.0-8 * Rebuild for rawhide. From 62eb30503fc2f891cbd3db877cfc77b1b640b07f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 27 Dec 2013 16:47:47 -0700 Subject: [PATCH 19/30] Add patch to use system netcdf --- vtk-6.0.0-netcdf.patch | 75 ++++++++++++++++++++++++++++++++++++++++++ vtk.spec | 14 +++++++- 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 vtk-6.0.0-netcdf.patch diff --git a/vtk-6.0.0-netcdf.patch b/vtk-6.0.0-netcdf.patch new file mode 100644 index 0000000..df0ef94 --- /dev/null +++ b/vtk-6.0.0-netcdf.patch @@ -0,0 +1,75 @@ +diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt +--- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 ++++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 +@@ -10,5 +10,5 @@ set(Module_SRCS + + vtk_module_library(vtkIONetCDF ${Module_SRCS}) + +-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx) ++target_link_libraries(vtkIONetCDF netcdf_c++ netcdf) + set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "") +diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt +--- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 ++++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 +@@ -8,4 +8,4 @@ set(Module_SRCS + + vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS}) + +-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx) ++target_link_libraries(vtkIOParallelNetCDF netcdf) +diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt +--- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 ++++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700 +@@ -241,7 +241,7 @@ ENDIF(APPLE) + + + VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) +-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) ++TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) + + #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) + +diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt +--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 ++++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 +@@ -1,8 +1,12 @@ + set(vtknetcdf_THIRD_PARTY 1) +-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) +-set(vtknetcdf_INCLUDE_DIRS +- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include +- ${vtknetcdf_BINARY_DIR}/vtknetcdf +- ) ++if(NOT VTK_USE_SYSTEM_NETCDF) ++ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) ++ set(vtknetcdf_INCLUDE_DIRS ++ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include ++ ${vtknetcdf_BINARY_DIR}/vtknetcdf ++ ) ++ add_subdirectory(vtknetcdf) ++else(NOT VTK_USE_SYSTEM_NETCDF) ++ set(vtknetcdf_LIBRARIES netcdf) ++endif() + vtk_module_export_info() +-add_subdirectory(vtknetcdf) +diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h +--- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700 ++++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700 +@@ -16,6 +16,6 @@ + #define __vtk_netcdfcpp_h + + /* Use the netcdf library configured for VTK. */ +-#include ++#include + + #endif +diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h +--- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700 ++++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700 +@@ -16,6 +16,6 @@ + #define __vtk_netcdf_h + + /* Use the netcdf library configured for VTK. */ +-#include ++#include + + #endif diff --git a/vtk.spec b/vtk.spec index 525a308..6df18a0 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.0.0 -Release: 9%{?dist} +Release: 10%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -29,6 +29,8 @@ Patch0: vtk-6.0.0-system.patch Patch1: vtk-install.patch # Upsream patch to install vtkpython Patch2: vtk-vtkpython.patch +#Patch to vtk to use system netcdf library +Patch3: vtk-6.0.0-netcdf.patch URL: http://vtk.org/ @@ -58,6 +60,7 @@ BuildRequires: boost-devel BuildRequires: hdf5-devel BuildRequires: libtheora-devel BuildRequires: mysql-devel +BuildRequires: netcdf-cxx-devel BuildRequires: postgresql-devel BuildRequires: R-devel BuildRequires: PyQt4-devel @@ -172,6 +175,12 @@ programming languages. %patch0 -p1 -b .system %patch1 -p1 -b .install %patch2 -p1 -b .vtkpython +%patch3 -p1 -b .netcdf +# Remove included thirdparty sources just to be sure +for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite tiff zlib +do + rm -r ThirdParty/${x}/vtk${x} +done # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} # otherwise it will break on symlinks. @@ -441,6 +450,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Fri Dec 27 2013 Orion Poplawski - 6.0.0-10 +- Add patch to use system netcdf + * Sun Dec 22 2013 Kevin Fenzi 6.0.0-9 - Add BuildRequires on blas-devel and lapack-devel From 27d36c602d5be877f57de3e86d33abce39562ede Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 27 Dec 2013 21:01:09 -0700 Subject: [PATCH 20/30] Add VTK_USE_SYSTEM_SQLITE; VTK_USE_SYSTEM_NETCDF --- vtk-6.0.0-system.patch | 34 ++++++++++++++++++++++++---------- vtk.spec | 7 +++++-- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/vtk-6.0.0-system.patch b/vtk-6.0.0-system.patch index 5246ece..07c097f 100644 --- a/vtk-6.0.0-system.patch +++ b/vtk-6.0.0-system.patch @@ -1,8 +1,7 @@ -diff --git a/CMake/vtkModuleMacros.cmake b/CMake/vtkModuleMacros.cmake -index 3e746a6..9ef38fd 100644 ---- a/CMake/vtkModuleMacros.cmake -+++ b/CMake/vtkModuleMacros.cmake -@@ -563,7 +563,7 @@ macro(vtk_module_third_party _pkg) +diff -up VTK6.0.0/CMake/vtkModuleMacros.cmake.system VTK6.0.0/CMake/vtkModuleMacros.cmake +--- VTK6.0.0/CMake/vtkModuleMacros.cmake.system 2013-06-12 13:47:10.000000000 -0600 ++++ VTK6.0.0/CMake/vtkModuleMacros.cmake 2013-12-27 20:52:29.299431600 -0700 +@@ -613,7 +613,7 @@ macro(vtk_module_third_party _pkg) message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") endif() @@ -11,11 +10,10 @@ index 3e746a6..9ef38fd 100644 mark_as_advanced(VTK_USE_SYSTEM_${_upper}) if(VTK_USE_SYSTEM_${_upper}) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d1dda8..b3e1801 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_INSTALL_INCLUDE_DIR}) +diff -up VTK6.0.0/CMakeLists.txt.system VTK6.0.0/CMakeLists.txt +--- VTK6.0.0/CMakeLists.txt.system 2013-06-12 13:47:10.000000000 -0600 ++++ VTK6.0.0/CMakeLists.txt 2013-12-27 20:52:29.299431600 -0700 +@@ -107,6 +107,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen) #----------------------------------------------------------------------------- @@ -27,3 +25,19 @@ index 0d1dda8..b3e1801 100644 # The third party macros are still used in one or two third party builds. include(vtkThirdParty) +diff -up VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt.system VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt +--- VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt.system 2013-06-12 13:47:10.000000000 -0600 ++++ VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt 2013-12-27 20:58:33.672959677 -0700 +@@ -1,4 +1,9 @@ + set(vtksqlite_THIRD_PARTY 1) +-set(vtksqlite_LIBRARIES vtksqlite) +-vtk_module_export_info() +-add_subdirectory(vtksqlite) ++if(VTK_USE_SYTEM_SQLITE) ++ set(vtksqlite_LIBRARIES sqlite3) ++ vtk_module_export_info() ++else(VTK_USE_SYTEM_SQLITE) ++ set(vtksqlite_LIBRARIES vtksqlite) ++ vtk_module_export_info() ++ add_subdirectory(vtksqlite) ++endif(VTK_USE_SYTEM_SQLITE) diff --git a/vtk.spec b/vtk.spec index 6df18a0..ef14369 100644 --- a/vtk.spec +++ b/vtk.spec @@ -60,11 +60,12 @@ BuildRequires: boost-devel BuildRequires: hdf5-devel BuildRequires: libtheora-devel BuildRequires: mysql-devel -BuildRequires: netcdf-cxx-devel +BuildRequires: netcdf-devel BuildRequires: postgresql-devel BuildRequires: R-devel BuildRequires: PyQt4-devel BuildRequires: sip-devel +BuildRequires: sqlite-devel BuildRequires: wget BuildRequires: %{_includedir}/Xm BuildRequires: blas-devel @@ -244,7 +245,9 @@ pushd build -DModule_vtkFiltersStatisticsGnuR:BOOL=ON \ -DVTK_USE_OGGTHEORA_ENCODER=ON \ -DVTK_USE_SYSTEM_LIBRARIES=ON \ - -DVTK_USE_SYSTEM_LIBPROJ4=OFF + -DVTK_USE_SYSTEM_LIBPROJ4=OFF \ + -DVTK_USE_SYSTEM_NETCDF=ON \ + -DVTK_USE_SYSTEM_SQLITE=ON # TODO - MPI #-DVTK_Group_MPI:BOOL=ON \ From 21516557d850aa955250dbacf7af47d4aa5e3d7e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 27 Dec 2013 21:21:44 -0700 Subject: [PATCH 21/30] Fix typo in sqlite system patch --- vtk-6.0.0-system.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vtk-6.0.0-system.patch b/vtk-6.0.0-system.patch index 07c097f..cb12591 100644 --- a/vtk-6.0.0-system.patch +++ b/vtk-6.0.0-system.patch @@ -1,6 +1,6 @@ diff -up VTK6.0.0/CMake/vtkModuleMacros.cmake.system VTK6.0.0/CMake/vtkModuleMacros.cmake --- VTK6.0.0/CMake/vtkModuleMacros.cmake.system 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/CMake/vtkModuleMacros.cmake 2013-12-27 20:52:29.299431600 -0700 ++++ VTK6.0.0/CMake/vtkModuleMacros.cmake 2013-12-27 20:59:39.548152746 -0700 @@ -613,7 +613,7 @@ macro(vtk_module_third_party _pkg) message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") endif() @@ -12,7 +12,7 @@ diff -up VTK6.0.0/CMake/vtkModuleMacros.cmake.system VTK6.0.0/CMake/vtkModuleMac if(VTK_USE_SYSTEM_${_upper}) diff -up VTK6.0.0/CMakeLists.txt.system VTK6.0.0/CMakeLists.txt --- VTK6.0.0/CMakeLists.txt.system 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/CMakeLists.txt 2013-12-27 20:52:29.299431600 -0700 ++++ VTK6.0.0/CMakeLists.txt 2013-12-27 20:59:39.548152746 -0700 @@ -107,6 +107,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen) @@ -27,17 +27,17 @@ diff -up VTK6.0.0/CMakeLists.txt.system VTK6.0.0/CMakeLists.txt diff -up VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt.system VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt --- VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt.system 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt 2013-12-27 20:58:33.672959677 -0700 ++++ VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt 2013-12-27 21:21:16.058122214 -0700 @@ -1,4 +1,9 @@ set(vtksqlite_THIRD_PARTY 1) -set(vtksqlite_LIBRARIES vtksqlite) -vtk_module_export_info() -add_subdirectory(vtksqlite) -+if(VTK_USE_SYTEM_SQLITE) ++if(VTK_USE_SYSTEM_SQLITE) + set(vtksqlite_LIBRARIES sqlite3) + vtk_module_export_info() -+else(VTK_USE_SYTEM_SQLITE) ++else(VTK_USE_SYSTEM_SQLITE) + set(vtksqlite_LIBRARIES vtksqlite) + vtk_module_export_info() + add_subdirectory(vtksqlite) -+endif(VTK_USE_SYTEM_SQLITE) ++endif(VTK_USE_SYSTEM_SQLITE) From 94c0db44b3a0e493d4a15b501da79ebd65c9ff37 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 27 Dec 2013 21:59:54 -0700 Subject: [PATCH 22/30] Abandon system sqlite for now --- vtk-6.0.0-system.patch | 16 ---------------- vtk.spec | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/vtk-6.0.0-system.patch b/vtk-6.0.0-system.patch index cb12591..3e5762f 100644 --- a/vtk-6.0.0-system.patch +++ b/vtk-6.0.0-system.patch @@ -25,19 +25,3 @@ diff -up VTK6.0.0/CMakeLists.txt.system VTK6.0.0/CMakeLists.txt # The third party macros are still used in one or two third party builds. include(vtkThirdParty) -diff -up VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt.system VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt ---- VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt.system 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/ThirdParty/sqlite/CMakeLists.txt 2013-12-27 21:21:16.058122214 -0700 -@@ -1,4 +1,9 @@ - set(vtksqlite_THIRD_PARTY 1) --set(vtksqlite_LIBRARIES vtksqlite) --vtk_module_export_info() --add_subdirectory(vtksqlite) -+if(VTK_USE_SYSTEM_SQLITE) -+ set(vtksqlite_LIBRARIES sqlite3) -+ vtk_module_export_info() -+else(VTK_USE_SYSTEM_SQLITE) -+ set(vtksqlite_LIBRARIES vtksqlite) -+ vtk_module_export_info() -+ add_subdirectory(vtksqlite) -+endif(VTK_USE_SYSTEM_SQLITE) diff --git a/vtk.spec b/vtk.spec index ef14369..6d5c873 100644 --- a/vtk.spec +++ b/vtk.spec @@ -178,7 +178,7 @@ programming languages. %patch2 -p1 -b .vtkpython %patch3 -p1 -b .netcdf # Remove included thirdparty sources just to be sure -for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite tiff zlib +for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib do rm -r ThirdParty/${x}/vtk${x} done From 163f774e62690f89544066d45218dab03786a252 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 28 Dec 2013 14:14:48 -0700 Subject: [PATCH 23/30] Really does require netcdf-cxx-devel --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 6d5c873..14ea93a 100644 --- a/vtk.spec +++ b/vtk.spec @@ -60,7 +60,7 @@ BuildRequires: boost-devel BuildRequires: hdf5-devel BuildRequires: libtheora-devel BuildRequires: mysql-devel -BuildRequires: netcdf-devel +BuildRequires: netcdf-cxx-devel BuildRequires: postgresql-devel BuildRequires: R-devel BuildRequires: PyQt4-devel From 8d93d810c6bc952eec76f59286907646f1ab09e3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 23 Jan 2014 22:18:07 -0700 Subject: [PATCH 24/30] Update to 6.1.0 - Rebase patches, drop vtkpython patch - Disable BUILD_TESTING for now until we can provide test data --- .gitignore | 1 + sources | 2 +- vtk-6.0.0-netcdf.patch | 75 ------------------- vtk-6.1.0-netcdf.patch | 29 +++++++ ...0.0-system.patch => vtk-6.1.0-system.patch | 18 ++--- vtk-install.patch | 12 +-- vtk.spec | 40 +++++----- 7 files changed, 69 insertions(+), 108 deletions(-) delete mode 100644 vtk-6.0.0-netcdf.patch create mode 100644 vtk-6.1.0-netcdf.patch rename vtk-6.0.0-system.patch => vtk-6.1.0-system.patch (54%) diff --git a/.gitignore b/.gitignore index 528f940..4cf8376 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ vtk-5.6.0.tar.gz /vtk-5.10.0.tar.gz /vtk-5.10.1.tar.gz /vtk-6.0.0.tar.gz +/VTK-6.1.0.tar.gz diff --git a/sources b/sources index e4c58d6..29ca26c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72ede4812c90bdc55172702f0cad02bb vtk-6.0.0.tar.gz +25e4dfb3bad778722dcaec80cd5dab7d VTK-6.1.0.tar.gz diff --git a/vtk-6.0.0-netcdf.patch b/vtk-6.0.0-netcdf.patch deleted file mode 100644 index df0ef94..0000000 --- a/vtk-6.0.0-netcdf.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt ---- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 -+++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 -@@ -10,5 +10,5 @@ set(Module_SRCS - - vtk_module_library(vtkIONetCDF ${Module_SRCS}) - --target_link_libraries(vtkIONetCDF vtkNetCDF_cxx) -+target_link_libraries(vtkIONetCDF netcdf_c++ netcdf) - set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "") -diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt ---- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 -+++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 -@@ -8,4 +8,4 @@ set(Module_SRCS - - vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS}) - --target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx) -+target_link_libraries(vtkIOParallelNetCDF netcdf) -diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt ---- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700 -@@ -241,7 +241,7 @@ ENDIF(APPLE) - - - VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) --TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) -+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) - - #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt ---- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 -@@ -1,8 +1,12 @@ - set(vtknetcdf_THIRD_PARTY 1) --set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) --set(vtknetcdf_INCLUDE_DIRS -- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include -- ${vtknetcdf_BINARY_DIR}/vtknetcdf -- ) -+if(NOT VTK_USE_SYSTEM_NETCDF) -+ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) -+ set(vtknetcdf_INCLUDE_DIRS -+ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include -+ ${vtknetcdf_BINARY_DIR}/vtknetcdf -+ ) -+ add_subdirectory(vtknetcdf) -+else(NOT VTK_USE_SYSTEM_NETCDF) -+ set(vtknetcdf_LIBRARIES netcdf) -+endif() - vtk_module_export_info() --add_subdirectory(vtknetcdf) -diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h ---- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700 -@@ -16,6 +16,6 @@ - #define __vtk_netcdfcpp_h - - /* Use the netcdf library configured for VTK. */ --#include -+#include - - #endif -diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h ---- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700 -@@ -16,6 +16,6 @@ - #define __vtk_netcdf_h - - /* Use the netcdf library configured for VTK. */ --#include -+#include - - #endif diff --git a/vtk-6.1.0-netcdf.patch b/vtk-6.1.0-netcdf.patch new file mode 100644 index 0000000..e6f8b64 --- /dev/null +++ b/vtk-6.1.0-netcdf.patch @@ -0,0 +1,29 @@ +diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt +--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-12-27 20:29:11.644289659 -0700 ++++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-12-27 20:33:48.071895769 -0700 +@@ -1,10 +1,18 @@ +-vtk_module_third_party(NetCDF +- LIBRARIES vtkNetCDF vtkNetCDF_cxx +- INCLUDE_DIRS +- ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include +- ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf +- COMPONENTS C CXX +- ) ++if(NOT VTK_USE_SYSTEM_NETCDF) ++ vtk_module_third_party(NetCDF ++ LIBRARIES vtkNetCDF vtkNetCDF_cxx ++ INCLUDE_DIRS ++ ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include ++ ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf ++ COMPONENTS C CXX ++ ) ++else(NOT VTK_USE_SYSTEM_NETCDF) ++ vtk_module_third_party(NetCDF ++ LIBRARIES vtkNetCDF netcdf ++ COMPONENTS C CXX ++ ) ++endif() ++ + + #Configure the top cpp header to switch between system and internal + #netcdf just like vtk_module_third_party does for the c header. diff --git a/vtk-6.0.0-system.patch b/vtk-6.1.0-system.patch similarity index 54% rename from vtk-6.0.0-system.patch rename to vtk-6.1.0-system.patch index 3e5762f..c75d544 100644 --- a/vtk-6.0.0-system.patch +++ b/vtk-6.1.0-system.patch @@ -1,7 +1,7 @@ -diff -up VTK6.0.0/CMake/vtkModuleMacros.cmake.system VTK6.0.0/CMake/vtkModuleMacros.cmake ---- VTK6.0.0/CMake/vtkModuleMacros.cmake.system 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/CMake/vtkModuleMacros.cmake 2013-12-27 20:59:39.548152746 -0700 -@@ -613,7 +613,7 @@ macro(vtk_module_third_party _pkg) +diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake +--- VTK/CMake/vtkModuleMacros.cmake.system 2013-12-24 19:17:43.000000000 -0700 ++++ VTK/CMake/vtkModuleMacros.cmake 2013-12-27 20:28:22.375573277 -0700 +@@ -682,7 +682,7 @@ macro(vtk_module_third_party _pkg) message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") endif() @@ -10,11 +10,11 @@ diff -up VTK6.0.0/CMake/vtkModuleMacros.cmake.system VTK6.0.0/CMake/vtkModuleMac mark_as_advanced(VTK_USE_SYSTEM_${_upper}) if(VTK_USE_SYSTEM_${_upper}) -diff -up VTK6.0.0/CMakeLists.txt.system VTK6.0.0/CMakeLists.txt ---- VTK6.0.0/CMakeLists.txt.system 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/CMakeLists.txt 2013-12-27 20:59:39.548152746 -0700 -@@ -107,6 +107,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I - set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen) +diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt +--- VTK/CMakeLists.txt.system 2013-12-27 20:28:22.374573241 -0700 ++++ VTK/CMakeLists.txt 2013-12-27 20:28:48.118669708 -0700 +@@ -132,6 +132,11 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE + endif() #----------------------------------------------------------------------------- +# Do we try to use system libraries by default? diff --git a/vtk-install.patch b/vtk-install.patch index a97755a..27c6c3a 100644 --- a/vtk-install.patch +++ b/vtk-install.patch @@ -1,17 +1,17 @@ -diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.cmake ---- VTK6.0.0/CMake/vtkModuleTop.cmake.install 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/CMake/vtkModuleTop.cmake 2013-07-12 16:15:15.706008475 -0600 -@@ -330,10 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) +diff -up VTK-6.1.0/CMake/vtkModuleTop.cmake.install VTK-6.1.0/CMake/vtkModuleTop.cmake +--- VTK-6.1.0/CMake/vtkModuleTop.cmake.install 2014-01-23 19:12:04.922871103 -0700 ++++ VTK-6.1.0/CMake/vtkModuleTop.cmake 2014-01-23 19:14:33.002645155 -0700 +@@ -330,11 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) CMake/pythonmodules.h.in CMake/UseVTK.cmake CMake/FindTCL.cmake + CMake/TopologicalSort.cmake CMake/vtkTclTkMacros.cmake CMake/vtk-forward.c.in - CMake/vtkForwardingExecutable.cmake + CMake/vtkGroups.cmake + CMake/vtkForwardingExecutable.cmake CMake/vtkJavaWrapping.cmake -+ CMake/vtkMakeInstantiator.cmake + CMake/vtkMakeInstantiator.cmake + CMake/vtkMakeInstantiator.cxx.in + CMake/vtkMakeInstantiator.h.in CMake/vtkModuleAPI.cmake diff --git a/vtk.spec b/vtk.spec index 14ea93a..2cc300f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -13,24 +13,22 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 6.0.0 -Release: 10%{?dist} +Version: 6.1.0 +Release: 1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant License: BSD Group: System Environment/Libraries -Source: http://www.vtk.org/files/release/6.0/%{name}-%{version}.tar.gz +Source: http://www.vtk.org/files/release/6.1/VTK-%{version}.tar.gz # Use system libraries # http://public.kitware.com/Bug/view.php?id=11823 -Patch0: vtk-6.0.0-system.patch +Patch0: vtk-6.1.0-system.patch # Install some more needed cmake files to try to support paraview build # http://www.vtk.org/Bug/view.php?id=14157 Patch1: vtk-install.patch -# Upsream patch to install vtkpython -Patch2: vtk-vtkpython.patch #Patch to vtk to use system netcdf library -Patch3: vtk-6.0.0-netcdf.patch +Patch2: vtk-6.1.0-netcdf.patch URL: http://vtk.org/ @@ -58,6 +56,7 @@ BuildRequires: doxygen, graphviz BuildRequires: gnuplot BuildRequires: boost-devel BuildRequires: hdf5-devel +BuildRequires: jsoncpp-devel BuildRequires: libtheora-devel BuildRequires: mysql-devel BuildRequires: netcdf-cxx-devel @@ -172,15 +171,15 @@ programming languages. %prep -%setup -q -n VTK%{version} +%setup -q -n VTK-%{version} %patch0 -p1 -b .system %patch1 -p1 -b .install -%patch2 -p1 -b .vtkpython -%patch3 -p1 -b .netcdf +%patch2 -p1 -b .netcdf # Remove included thirdparty sources just to be sure -for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib +# TODO - vtksqlite +for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope do - rm -r ThirdParty/${x}/vtk${x} + rm -r ThirdParty/*/${x} done # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} @@ -211,9 +210,10 @@ pushd build %endif -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ - -DBUILD_TESTING:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \ + -DVTK_INSTALL_DATA_DIR=share/paraview \ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \ @@ -231,7 +231,6 @@ pushd build %else -DVTK_WRAP_JAVA:BOOL=OFF \ %endif - -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ -DSIP_INCLUDE_DIR:PATH=/usr/include/python2.7 \ @@ -243,11 +242,13 @@ pushd build -DVTK_Group_Tk:BOOL=ON \ -DVTK_Group_Views:BOOL=ON \ -DModule_vtkFiltersStatisticsGnuR:BOOL=ON \ + -DModule_vtkTestingCore:BOOL=ON \ + -DModule_vtkTestingRendering:BOOL=ON \ -DVTK_USE_OGGTHEORA_ENCODER=ON \ -DVTK_USE_SYSTEM_LIBRARIES=ON \ - -DVTK_USE_SYSTEM_LIBPROJ4=OFF \ - -DVTK_USE_SYSTEM_NETCDF=ON \ - -DVTK_USE_SYSTEM_SQLITE=ON + -DVTK_USE_SYSTEM_HDF5:BOOL=ON \ + -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \ + -DVTK_USE_SYSTEM_NETCDF:BOOL=ON # TODO - MPI #-DVTK_Group_MPI:BOOL=ON \ @@ -453,6 +454,11 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Thu Jan 23 2014 Orion Poplawski - 6.1.0-1 +- Update to 6.1.0 +- Rebase patches, drop vtkpython patch +- Disable BUILD_TESTING for now until we can provide test data + * Fri Dec 27 2013 Orion Poplawski - 6.0.0-10 - Add patch to use system netcdf From 6c2a3c28be595e528a0960d3c666ac68ee075076 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Jan 2014 15:00:51 -0700 Subject: [PATCH 25/30] Fix python install dir; Other cleanup --- vtk.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/vtk.spec b/vtk.spec index 2cc300f..0848ab8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -217,6 +217,7 @@ pushd build -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \ + -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{python_version}/site-packages \ -DVTK_INSTALL_QT_DIR:PATH=/%{_lib}/qt4/plugins/designer \ -DVTK_INSTALL_TCL_DIR:PATH=share/tcl%{tcl_version}/vtk \ -DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \ @@ -233,7 +234,7 @@ pushd build %endif -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ - -DSIP_INCLUDE_DIR:PATH=/usr/include/python2.7 \ + -DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python_version} \ -DVTK_WRAP_TCL:BOOL=ON \ -DVTK_Group_Imaging:BOOL=ON \ -DVTK_Group_Qt:BOOL=ON \ @@ -328,12 +329,11 @@ for filelist in utils.list examples.list; do done # Remove any remnants of rpaths on files we install +# Seems to be some kind of java path for file in `cat examples.list`; do chrpath -d %{buildroot}$file done - -# http://vtk.org/Bug/view.php?id=14125 -chrpath -d %{buildroot}%{python_sitearch}/vtk/*.so +chrpath -d %{buildroot}%{_libdir}/qt4/plugins/designer/libQVTKWidgetPlugin.so # Main package contains utils and core libs cat libs.list utils.list > main.list @@ -351,9 +351,6 @@ for file in `find %{buildroot} -type f -perm 0755 \ done find Utilities/Upgrading -type f | xargs chmod -x -# Add exec bits to shared libs ... -chmod 0755 %{buildroot}%{_libdir}/python*/site-packages/vtk/*.so - # Setup Wrapping docs tree mkdir _docs cp -pr --parents Wrapping/*/README* _docs/ @@ -407,8 +404,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %{_libdir}/vtk/libvtkWrappingTools.a %{_libdir}/cmake/vtk/ %{_bindir}/vtkParseOGLExt -%{_bindir}/vtkProcessShader -%{_docdir}/vtk-6.0/ +%{_docdir}/vtk-6.1/ %{tcl_sitelib}/vtk/vtktcl.c %files tcl From 2f020d178e89779252d089731085c47415b353ba Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Jan 2014 19:42:45 -0700 Subject: [PATCH 26/30] Fix data dir location --- vtk.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 0848ab8..f0952ac 100644 --- a/vtk.spec +++ b/vtk.spec @@ -213,7 +213,7 @@ pushd build -DBUILD_TESTING:BOOL=OFF \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \ - -DVTK_INSTALL_DATA_DIR=share/paraview \ + -DVTK_INSTALL_DATA_DIR=share/vtk \ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \ @@ -393,6 +393,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %files -f build/main.list %doc Copyright.txt README.html vtkLogo.jpg vtkBanner.gif _docs/Wrapping %config(noreplace) %{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf +%{_datadir}/vtk %dir %{_libdir}/vtk %files devel From 6a4890dbeceb781a358f0365ffc02f97a6b49f1b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Jan 2014 13:55:00 -0700 Subject: [PATCH 27/30] Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) --- vtk.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vtk.spec b/vtk.spec index d49399e..0d4781c 100644 --- a/vtk.spec +++ b/vtk.spec @@ -84,9 +84,11 @@ Requires: vtk = %{version}-%{release} Requires: cmake Requires: gl2ps-devel Requires: expat-devel, libjpeg-devel, libpng-devel +Requires: libfreetype-devel Requires: libogg-devel Requires: libtheora-devel Requires: libtiff-devel +Requires: libxml2-devel Requires: postgresql-devel Requires: mysql-devel Requires: qt4-devel From 9597c567176eb3d3ea2762444dbe605e7b281341 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Jan 2014 13:59:43 -0700 Subject: [PATCH 28/30] Bump release and add changelog --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d2c8511..20d45cd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.1.0 -Release: 1%{?dist} +Release: 2%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -453,6 +453,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Sun Jan 26 2014 Orion Poplawski - 6.1.0-2 +- Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) + * Thu Jan 23 2014 Orion Poplawski - 6.1.0-1 - Update to 6.1.0 - Rebase patches, drop vtkpython patch From bd7ab6ffcd6c01af9902067d2b3cd5a81f58695b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Jan 2014 20:54:08 -0700 Subject: [PATCH 29/30] Fix requires freetype-devel --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 20d45cd..f3a66c2 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.1.0 -Release: 2%{?dist} +Release: 3%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -453,6 +453,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Mon Jan 27 2014 Orion Poplawski - 6.1.0-3 +- Fix requires freetype-devel + * Sun Jan 26 2014 Orion Poplawski - 6.1.0-2 - Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) From 41ab70bf4b18f95547e074427be55e0a36b8ba57 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 28 Jan 2014 07:30:02 -0700 Subject: [PATCH 30/30] Fix requires freetype-devel --- vtk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index f3a66c2..a69272f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,7 +14,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.1.0 -Release: 3%{?dist} +Release: 4%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -89,7 +89,7 @@ Requires: vtk = %{version}-%{release} Requires: cmake Requires: gl2ps-devel Requires: expat-devel, libjpeg-devel, libpng-devel -Requires: libfreetype-devel +Requires: freetype-devel Requires: libogg-devel Requires: libtheora-devel Requires: libtiff-devel @@ -453,6 +453,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Tue Jan 28 2014 Orion Poplawski - 6.1.0-4 +- Really fix requires freetype-devel + * Mon Jan 27 2014 Orion Poplawski - 6.1.0-3 - Fix requires freetype-devel