From f85d676bed37e65d042ef5a66989452cbc442c70 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jul 23 2009 19:29:42 +0000 Subject: - Update to 3.6.1 --- diff --git a/.cvsignore b/.cvsignore index 8d25be3..3a2eab8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -paraview-3.4.0.tar.gz +paraview-3.6.1.tar.gz diff --git a/paraview-3.2.1-assistant-qt4.patch b/paraview-3.2.1-assistant-qt4.patch deleted file mode 100644 index 6a2e531..0000000 --- a/paraview-3.2.1-assistant-qt4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ParaView3.2.1/Applications/Client/MainWindow.cxx.assistant-qt4 2007-11-07 13:52:05.000000000 -0700 -+++ ParaView3.2.1/Applications/Client/MainWindow.cxx 2007-12-03 14:30:44.000000000 -0700 -@@ -896,7 +896,7 @@ - QString assistantExe; - QString profileFile; - -- const char* assistantName = "assistant"; -+ const char* assistantName = "assistant-qt4"; - #if defined(Q_WS_WIN) - const char* binDir = "\\"; - const char* binDir1 = "\\..\\"; diff --git a/paraview-3.3.0-install.patch b/paraview-3.3.0-install.patch deleted file mode 100644 index 27cbcf0..0000000 --- a/paraview-3.3.0-install.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ParaView3.3.0-20080717/Applications/Client/CMakeLists.txt.install 2008-07-17 13:22:39.000000000 -0600 -+++ ParaView3.3.0-20080717/Applications/Client/CMakeLists.txt 2008-07-18 16:05:03.000000000 -0600 -@@ -552,12 +552,6 @@ - GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) - GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) - FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") -- INSTALL(CODE " --MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\") --EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} -- COMMAND tar c ${QT_LIB_LIST} -- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}) -- " COMPONENT Runtime) - ELSE (NOT WIN32) - GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) - INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime) diff --git a/paraview-3.3.1-gcc43.patch b/paraview-3.3.1-gcc43.patch deleted file mode 100644 index 528a76f..0000000 --- a/paraview-3.3.1-gcc43.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfArray.h.gcc43 2008-06-26 14:52:35.000000000 -0600 -+++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-07-16 12:03:40.000000000 -0600 -@@ -26,6 +26,7 @@ - #define __XdmfArray_h - - #include "XdmfDataDesc.h" -+#include - - #define XDMF_LONGEST_LENGTH (XdmfInt64)~0 - #define XDMF_ARRAY_TAG_LENGTH 80 ---- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfDataDesc.h.gcc43 2008-03-04 14:54:42.000000000 -0700 -+++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-07-16 12:03:40.000000000 -0600 -@@ -27,6 +27,7 @@ - - #include "XdmfObject.h" - #include "XdmfHDFSupport.h" -+#include - - #define XDMF_SELECTALL 0 - #define XDMF_HYPERSLAB 1 ---- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.gcc43 2008-07-15 17:22:46.000000000 -0600 -+++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-07-16 12:03:40.000000000 -0600 -@@ -34,6 +34,7 @@ - #include "XdmfDsmComm.h" - #include "assert.h" - #include "hdf5.h" -+#include - - #include - diff --git a/paraview-3.4.0-doc.patch b/paraview-3.4.0-doc.patch deleted file mode 100644 index e3220f0..0000000 --- a/paraview-3.4.0-doc.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ParaView3.3.0-20080717/Applications/Client/CMakeLists.txt.doc 2008-07-17 13:22:39.000000000 -0600 -+++ ParaView3.3.0-20080717/Applications/Client/CMakeLists.txt 2008-07-17 13:29:08.000000000 -0600 -@@ -156,7 +156,7 @@ - FILE(TO_NATIVE_PATH "${QT_ASSISTANT_EXECUTABLE}" PV_ASSISTANT) - MARK_AS_ADVANCED(QT_ASSISTANT_EXECUTABLE) - --FILE(TO_NATIVE_PATH "${ParaView_BINARY_DIR}/pqClient.adp" PV_CLIENT_DOC) -+FILE(TO_NATIVE_PATH "/usr/share/paraview/pqClient.adp" PV_CLIENT_DOC) - - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pqClientDocFinder.txt.in" - "${EXECUTABLE_OUTPUT_PATH}/pqClientDocFinder.txt" ---- ParaView-3.4.0/Applications/Client/MainWindow.cxx.doc 2009-02-24 14:13:53.000000000 -0700 -+++ ParaView-3.4.0/Applications/Client/MainWindow.cxx 2009-05-07 13:48:02.000000000 -0600 -@@ -1020,10 +1020,7 @@ - - if(profileFile.isEmpty()) - { -- // see if help is bundled up with the application -- QString profile = ::Locate("pqClient.adp"); -- /*QCoreApplication::applicationDirPath() + QDir::separator() -- + QString("pqClient.adp");*/ -+ QString profile = QString("/usr/share/paraview/pqClient.adp"); - if(QFile::exists(profile)) - { - profileFile = profile; -@@ -1040,8 +1037,7 @@ - // no help, error out - QMessageBox::critical( - this, "Help error", "Couldn't find" -- " pqClient.adp.\nTry setting the PARAVIEW_HELP environment variable which" -- " points to that file"); -+ " pqClient.adp.\nMake sure that the paraview-doc package is installed"); - - delete this->Implementation->AssistantClient; - return; diff --git a/paraview-3.4.0-qt.patch b/paraview-3.4.0-qt.patch deleted file mode 100644 index 1d74b29..0000000 --- a/paraview-3.4.0-qt.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ParaView-3.4.0/CMakeLists.txt.qt 2008-09-12 07:33:51.000000000 -0600 -+++ ParaView-3.4.0/CMakeLists.txt 2009-02-24 12:48:19.000000000 -0700 -@@ -91,12 +91,7 @@ - # don't go greater than supported version - STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}") - IF (NOT qt_version_tmp) -- STRING(REGEX MATCH "^4\\.4\\.[0-9]+" qt_version4_4_tmp "${QTVERSION}") -- IF (NOT qt_version4_4_tmp) -- MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.3 (you may need to clean your dirtied cache).") -- ELSE (NOT qt_version4_4_tmp) -- MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3") -- ENDIF (NOT qt_version4_4_tmp) -+ MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3") - ENDIF (NOT qt_version_tmp) - # enforce Carbon in VTK for Qt/Mac - IF(Q_WS_MAC) diff --git a/paraview-3.6.0-assistant-qt4.patch b/paraview-3.6.0-assistant-qt4.patch new file mode 100644 index 0000000..4670bde --- /dev/null +++ b/paraview-3.6.0-assistant-qt4.patch @@ -0,0 +1,22 @@ +--- ParaView-3.6.0/Applications/OverView/Core/MainWindow.cxx.assistant-qt4 2009-06-29 16:51:37.273654166 -0600 ++++ ParaView-3.6.0/Applications/OverView/Core/MainWindow.cxx 2009-06-29 16:52:03.205652509 -0600 +@@ -933,7 +933,7 @@ + QString assistantExe; + QString profileFile; + +- const char* assistantName = "assistant"; ++ const char* assistantName = "assistant-qt4"; + #if defined(Q_WS_WIN) + const char* binDir = "\\"; + const char* binDir1 = "\\..\\"; +--- ParaView-3.6.0/Qt/Components/pqClientMainWindow.cxx.assitant-qt4 2009-06-29 16:51:37.285652874 -0600 ++++ ParaView-3.6.0/Qt/Components/pqClientMainWindow.cxx 2009-06-29 16:52:08.521653470 -0600 +@@ -989,7 +989,7 @@ + QString assistantExe; + QString profileFile; + +- const char* assistantName = "assistant"; ++ const char* assistantName = "assistant-qt4"; + #if defined(Q_WS_WIN) + const char* extString = ".exe"; + const char* binDir = "\\"; diff --git a/paraview-3.6.0-install.patch b/paraview-3.6.0-install.patch new file mode 100644 index 0000000..d407553 --- /dev/null +++ b/paraview-3.6.0-install.patch @@ -0,0 +1,18 @@ +--- ParaView-3.6.0/Applications/Client/CMakeLists.txt.install 2009-05-22 11:00:47.000000000 -0600 ++++ ParaView-3.6.0/Applications/Client/CMakeLists.txt 2009-06-29 16:36:03.319592245 -0600 +@@ -531,15 +531,6 @@ + FOREACH(qtlib ${QTLIBLIST}) + IF (NOT WIN32) + #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR}) +- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) +- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) +- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") +- INSTALL(CODE " +-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\") +-EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} +- COMMAND tar c ${QT_LIB_LIST} +- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}) +- " COMPONENT Runtime) + ELSE (NOT WIN32) + GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) + INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime) diff --git a/paraview-3.6.1-cmake-install-prefix.patch b/paraview-3.6.1-cmake-install-prefix.patch new file mode 100644 index 0000000..c722916 --- /dev/null +++ b/paraview-3.6.1-cmake-install-prefix.patch @@ -0,0 +1,79 @@ +--- ParaView3/CMake/ParaViewCommon.cmake.cmake-install-prefix 2009-06-12 13:25:41.000000000 -0600 ++++ ParaView3/CMake/ParaViewCommon.cmake 2009-07-22 13:22:37.286421389 -0600 +@@ -121,7 +121,7 @@ + IF(NOT WIN32) + SET(PV_NEED_SHARED_FORWARD 1) + SET(PV_EXE_SUFFIX -real) +- SET(PV_EXE_INSTALL ${PV_INSTALL_LIB_DIR}) ++ SET(PV_EXE_INSTALL "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}") + SET(PV_FORWARD_DIR_BUILD "${EXECUTABLE_OUTPUT_PATH}") + SET(PV_FORWARD_DIR_INSTALL "../${PV_EXE_INSTALL}") + SET(PV_FORWARD_PATH_BUILD "\"${PV_FORWARD_DIR_BUILD}\"") +--- ParaView3/Servers/ServerManager/CMakeLists.txt.cmake-install-prefix 2009-05-08 12:54:32.000000000 -0600 ++++ ParaView3/Servers/ServerManager/CMakeLists.txt 2009-07-22 13:25:46.164483300 -0600 +@@ -1,7 +1,8 @@ + PROJECT(ServerManager) + + # needed by vtkExportKit.cmake +-SET(VTK_INSTALL_PACKAGE_DIR_CM24 ${PV_INSTALL_LIB_DIR}) ++SET(VTK_INSTALL_PACKAGE_DIR_CM24 ++ "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}") + #SET(VTK_INSTALL_PACKAGE_DIR ${PV_INSTALL_LIB_DIR}) + + # Any build configured headers should be added to this +@@ -505,7 +506,7 @@ + IF(NOT PV_INSTALL_NO_RUNTIME) + INSTALL( + FILES ${resourceFiles} +- DESTINATION ${PV_INSTALL_LIB_DIR}/ServerManager/Resources) ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/ServerManager/Resources) + ENDIF(NOT PV_INSTALL_NO_RUNTIME) + # + # Development +--- ParaView3/Utilities/VTKPythonWrapping/CMakeLists.txt.cmake-install-prefix 2009-01-23 11:35:43.000000000 -0700 ++++ ParaView3/Utilities/VTKPythonWrapping/CMakeLists.txt 2009-07-22 13:19:31.941421112 -0600 +@@ -158,7 +158,7 @@ + # Install the paraview module files. + IF (NOT PV_INSTALL_NO_LIBRARIES) + INSTALL(DIRECTORY ${PV_PYTHON_MODULE_BINARY_DIR} +- DESTINATION ${PV_INSTALL_LIB_DIR} ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}" + COMPONENT Runtime + ) + ENDIF (NOT PV_INSTALL_NO_LIBRARIES) +--- ParaView3/Utilities/IceT/CMakeLists.txt.cmake-install-prefix 2008-10-17 10:43:26.000000000 -0600 ++++ ParaView3/Utilities/IceT/CMakeLists.txt 2009-07-22 15:02:01.183421081 -0600 +@@ -152,11 +152,11 @@ + # CMAKE_IMPORT_BUILD_SETTINGS() + INCLUDE(CMakeExportBuildSettings) + CMAKE_EXPORT_BUILD_SETTINGS(${ICET_BINARY_DIR}/ICETBuildSettings.cmake) +-INSTALL(FILES ${ICET_BINARY_DIR}/ICETBuildSettings.cmake DESTINATION ${ICET_INSTALL_LIB_DIR}) ++INSTALL(FILES ${ICET_BINARY_DIR}/ICETBuildSettings.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/${ICET_INSTALL_LIB_DIR}) + + # Save the library dependency graph for external projects. + EXPORT_LIBRARY_DEPENDENCIES(${ICET_BINARY_DIR}/ICETLibraryDepends.cmake) +-INSTALL(FILES ${ICET_BINARY_DIR}/ICETLibraryDepends.cmake DESTINATION ${ICET_INSTALL_LIB_DIR}) ++INSTALL(FILES ${ICET_BINARY_DIR}/ICETLibraryDepends.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/${ICET_INSTALL_LIB_DIR}) + + # Save ICE-T specific configuration options. + #First, configuration for build directory. +@@ -186,7 +186,7 @@ + SET(ICET_MPI_LIBRARY_FILE "${CMAKE_INSTALL_PREFIX}${ICET_INSTALL_LIB_DIR}/${ICET_MPI_LIBRARY_FILE}") + CONFIGURE_FILE(${ICET_SOURCE_DIR}/ICETConfig.cmake.in + ${ICET_LIBRARY_DIR}/ICETConfig.cmake @ONLY IMMEDIATE) +-INSTALL(FILES ${ICET_SOURCE_DIR}/UseICET.cmake ${ICET_LIBRARY_DIR}/ICETConfig.cmake DESTINATION ${ICET_INSTALL_LIB_DIR}) ++INSTALL(FILES ${ICET_SOURCE_DIR}/UseICET.cmake ${ICET_LIBRARY_DIR}/ICETConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/${ICET_INSTALL_LIB_DIR}) + + # Allow local additions to this file without CVS conflicts. + INCLUDE(${ICET_BINARY_DIR}/LocalUserOptions.cmake OPTIONAL) +--- ParaView3/Plugins/pvblot/CMakeLists.txt.cmake-install-prefix 2009-06-01 06:59:23.000000000 -0600 ++++ ParaView3/Plugins/pvblot/CMakeLists.txt 2009-07-22 15:05:00.798421716 -0600 +@@ -73,7 +73,7 @@ + # installing the Python source files. + INSTALL( + FILES ${PYMODULES} +- DESTINATION ${PV_INSTALL_LIB_DIR} ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR} + ) + + SET(PVBLOT_PVPYTHON_EXECUTABLE "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_BIN_DIR}/pvpython${PV_EXE_SUFFIX}") diff --git a/paraview-3.6.1-demo.patch b/paraview-3.6.1-demo.patch new file mode 100644 index 0000000..383de4f --- /dev/null +++ b/paraview-3.6.1-demo.patch @@ -0,0 +1,10 @@ +--- ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt.demo 2009-07-20 13:37:07.000000000 -0600 ++++ ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2009-07-22 09:24:11.489421127 -0600 +@@ -4,7 +4,3 @@ + add_executable(${exe} PointSpriteDemo.cxx) + + target_link_libraries(${exe} CSCS_PointSprite_Rendering vtkIO) +- +-install(TARGETS ${exe} +- RUNTIME DESTINATION ${PROJECT_BINARY_DIR} +-) diff --git a/paraview-3.6.1-doc.patch b/paraview-3.6.1-doc.patch new file mode 100644 index 0000000..d741582 --- /dev/null +++ b/paraview-3.6.1-doc.patch @@ -0,0 +1,60 @@ +--- ParaView3/Applications/Client/CMakeLists.txt.doc 2009-07-21 16:12:15.214230597 -0600 ++++ ParaView3/Applications/Client/CMakeLists.txt 2009-07-21 16:19:41.606170088 -0600 +@@ -130,7 +130,7 @@ + IMMEDIATE) + INSTALL( + FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt" +- DESTINATION ${PV_INSTALL_BIN_DIR} ++ DESTINATION "/usr/share/paraview" + COMPONENT Runtime) + ENDIF(NOT PV_INSTALL_NO_RUNTIME) + +--- ParaView3/Applications/OverView/Core/MainWindow.cxx.doc 2009-07-20 13:36:12.000000000 -0600 ++++ ParaView3/Applications/OverView/Core/MainWindow.cxx 2009-07-21 16:13:56.103167958 -0600 +@@ -987,7 +987,7 @@ + if(profileFile.isEmpty()) + { + // see if help is bundled up with the application +- QString profile = ::Locate("pqClient.adp"); ++ QString profile = QString("/usr/share/paraview/pqClient.adp"); + /*QCoreApplication::applicationDirPath() + QDir::separator() + + QString("pqClient.adp");*/ + if(QFile::exists(profile)) +--- ParaView3/Documentation/CMakeLists.txt.doc 2008-12-22 14:06:00.000000000 -0700 ++++ ParaView3/Documentation/CMakeLists.txt 2009-07-21 16:17:55.928230792 -0600 +@@ -143,7 +143,7 @@ + set(dir "${ParaView_BINARY_DIR}/Documentation/") + install( + DIRECTORY ${ParaView_BINARY_DIR}/Documentation/ +- DESTINATION ${PV_EXE_INSTALL}/Documentation ++ DESTINATION "/usr/share/paraview/Documentation" + COMPONENT Runtime + REGEX ".html") + +@@ -155,7 +155,7 @@ + + install( + FILES "${ParaView_BINARY_DIR}/about.html" +- DESTINATION ${PV_INSTALL_BIN_DIR} ++ DESTINATION "/usr/share/paraview" + COMPONENT Runtime) + + configure_file( +@@ -165,5 +165,5 @@ + + install( + FILES ${ParaView_BINARY_DIR}/pqClient.adp +- DESTINATION ${PV_EXE_INSTALL} ++ DESTINATION "/usr/share/paraview" + COMPONENT Runtime) +--- ParaView3/Qt/Components/pqClientMainWindow.cxx.doc 2009-07-20 13:37:39.000000000 -0600 ++++ ParaView3/Qt/Components/pqClientMainWindow.cxx 2009-07-21 16:13:13.306167232 -0600 +@@ -1060,7 +1060,7 @@ + #if defined(Q_WS_MAC) + QString profile = QCoreApplication::applicationDirPath() + "/../Support/pqClient.adp"; + #else +- QString profile = ::Locate("pqClient.adp"); ++ QString profile = QString("/usr/share/paraview/pqClient.adp"); + #endif + /*QCoreApplication::applicationDirPath() + QDir::separator() + + QString("pqClient.adp");*/ diff --git a/paraview-3.6.1-plugins.patch b/paraview-3.6.1-plugins.patch new file mode 100644 index 0000000..0a30dde --- /dev/null +++ b/paraview-3.6.1-plugins.patch @@ -0,0 +1,11 @@ +--- ParaView3/CMake/ParaViewPlugins.cmake.plugins 2009-07-20 13:36:16.000000000 -0600 ++++ ParaView3/CMake/ParaViewPlugins.cmake 2009-07-22 09:45:23.993423101 -0600 +@@ -8,7 +8,7 @@ + MACRO(internal_paraview_install_plugin name) + IF (PV_INSTALL_BIN_DIR) + INSTALL(TARGETS ${name} +- DESTINATION "${PV_INSTALL_BIN_DIR}/plugins/${name}" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/plugins/${name}" + COMPONENT Runtime) + ENDIF (PV_INSTALL_BIN_DIR) + ENDMACRO(internal_paraview_install_plugin) diff --git a/paraview.spec b/paraview.spec index 5c7e6a9..4a5b67e 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,12 +1,12 @@ %{!?build_mpi:%define build_mpi 1} %define pv_maj 3 -%define pv_min 4 -%define pv_patch 0 +%define pv_min 6 +%define pv_patch 1 %define pv_majmin %{pv_maj}.%{pv_min} Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Parallel visualization application Group: Applications/Engineering @@ -15,15 +15,22 @@ URL: http://www.paraview.org/ Source0: http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz Source1: paraview_22x22.png Source2: paraview.xml -#Allow build with Qt 4.5 -Patch1: paraview-3.4.0-qt.patch +#Fixup some install locations +#Reported upstream: http://public.kitware.com/mantis/view.php?id=9301 +Patch1: paraview-3.6.1-cmake-install-prefix.patch #Don't try to copy Qt libraries into paraview directory -Patch2: paraview-3.3.0-install.patch +Patch2: paraview-3.6.0-install.patch #Move pqClient.adp into %{_datadir}/paraview -Patch3: paraview-3.4.0-doc.patch -Patch4: paraview-3.2.1-assistant-qt4.patch +Patch3: paraview-3.6.1-doc.patch +#Look for assistant-qt4 instead of assistant +Patch4: paraview-3.6.0-assistant-qt4.patch #Reported upstream: http://public.kitware.com/Bug/view.php?id=7022 -Patch6: paraview-3.3.1-gcc43.patch +#Installs PointSpriteDemo into incorrect location, remove install for now +#Reported upstream: http://public.kitware.com/mantis/view.php?id=9292 +Patch5: paraview-3.6.1-demo.patch +#Install plugins into %{_libdir}/paraview/plugins instead of %{_bindir}/plugins +#Reported upstream: http://public.kitware.com/mantis/view.php?id=9293 +Patch6: paraview-3.6.1-plugins.patch #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023 Patch7: paraview-3.2.2-hdf5.patch Patch8: paraview-3.4.0-hdf5-1.8.2.patch @@ -43,6 +50,7 @@ BuildRequires: readline-devel BuildRequires: openssl-devel BuildRequires: gnuplot BuildRequires: wget +BuildRequires: boost-devel Requires: %{name}-data = %{version}-%{release} Requires: %{name}-doc = %{version}-%{release} Requires: qt4-assistant @@ -51,6 +59,54 @@ Requires(postun): /usr/bin/update-desktop-database Obsoletes: paraview-demos < %{version}-%{release} Provides: paraview-demos = %{version}-%{release} +#VTK_USE_RPATH=OFF needed to build everything +%define paraview_cmake_options \\\ + -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\ + -DCMAKE_C_COMPILER:FILEPATH=$CC \\\ + -DTCL_LIBRARY:PATH=tcl \\\ + -DTK_LIBRARY:PATH=tk \\\ + -DPARAVIEW_BUILD_OverView:BOOL=ON \\\ + -DPARAVIEW_BUILD_StreamingParaView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientHierarchyView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_Infovis:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_netCDFReaders:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_VisItReaderPlugin:BOOL=OFF \\\ + -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\ + -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \\\ + -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\ + -DVTK_USE_BOOST:BOOL=ON \\\ + -DVTK_USE_INFOVIS:BOOL=OFF \\\ + -DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\ + -DVTK_USE_RPATH:BOOL=OFF \\\ + -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \\\ + -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \\\ + -DVTK_USE_SYSTEM_JPEG:BOOL=ON \\\ + -DVTK_USE_SYSTEM_PNG:BOOL=ON \\\ + -DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\ + -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\ + -DBUILD_DOCUMENTATION:BOOL=ON \\\ + -DBUILD_EXAMPLES:BOOL=ON %description ParaView is an application designed with the need to visualize large data @@ -121,12 +177,13 @@ BuildArch: noarch %prep -%setup -q -n ParaView-%{version} -%patch1 -p1 -b .qt +%setup -q -n ParaView3 +%patch1 -p1 -b .cmake-install-prefix %patch2 -p1 -b .install %patch3 -p1 -b .doc %patch4 -p1 -b .assistant-qt4 -%patch6 -p1 -b .gcc43 +%patch5 -p1 -b .demo +%patch6 -p1 -b .plugins %patch7 -p1 -b .hdf5 %patch8 -p1 -b .hdf5-1.8.2 #Remove included hdf5 just to be sure @@ -142,27 +199,10 @@ export CXX='g++' export MAKE='make' export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API" export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API" -#VTK_USE_RPATH=OFF needed to build everything %cmake .. \ -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview \ - -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \ - -DCMAKE_C_COMPILER:FILEPATH=$CC \ - -DTCL_LIBRARY:PATH=tcl \ - -DTK_LIBRARY:PATH=tk \ - -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ - -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ - -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ - -DVTK_USE_INFOVIS:BOOL=OFF \ - -DVTK_USE_RPATH:BOOL=OFF \ - -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ - -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ - -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ - -DVTK_USE_SYSTEM_PNG:BOOL=ON \ - -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ - -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ - -DBUILD_DOCUMENTATION:BOOL=ON \ - -DBUILD_EXAMPLES:BOOL=ON -#Need to run cmake twice to get MPI headers into VTK/Parallel build config + %{paraview_cmake_options} +##Need to run cmake twice to get MPI headers into VTK/Parallel build config cmake .. make VERBOSE=1 %{?_smp_mflags} popd @@ -174,28 +214,12 @@ export CXX='g++' export MAKE='make' export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API" export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API" -#VTK_USE_RPATH=OFF needed to build everything %cmake .. \ -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-mpi \ - -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \ - -DCMAKE_C_COMPILER:FILEPATH=$CC \ - -DTCL_LIBRARY:PATH=tcl \ - -DTK_LIBRARY:PATH=tk \ - -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ -DPARAVIEW_USE_MPI:BOOL=ON \ - -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ -DICET_BUILD_TESTING:BOOL=ON \ - -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ - -DVTK_USE_INFOVIS:BOOL=OFF \ - -DVTK_USE_RPATH:BOOL=OFF \ - -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ - -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ - -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ - -DVTK_USE_SYSTEM_PNG:BOOL=ON \ - -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ - -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ - -DBUILD_DOCUMENTATION:BOOL=ON \ - -DBUILD_EXAMPLES:BOOL=ON + -DMPI_COMPILER:FILEPATH=%{_libdir}/openmpi/$(pkg-config --modversion openmpi)/bin/mpicxx \ + %{paraview_cmake_options} #Need to run cmake twice to get MPI headers into VTK/Parallel build config cmake .. make VERBOSE=1 %{?_smp_mflags} @@ -226,7 +250,7 @@ pushd $RPM_BUILD_ROOT/%{_bindir} #Don't ship copy of Qt assisstant rm $RPM_BUILD_ROOT%{_bindir}/assistant #Don't need mpi versions of these -rm -f paraview pvpython pvTestDriver vtkSMExtractDocumentation +rm -f lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation #Move the remaining mpi binaries out of the way for f in * do @@ -237,8 +261,12 @@ popd #Remove mpi copy of includes, man pages, and documentation rm -rf $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin} rm -rf $RPM_BUILD_ROOT%{_mandir} -rm -r $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/{doc,Documentation,pqClient.adp} +#rm -r $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/{doc,Documentation,pqClient.adp} popd + +#Move some stuff to the proper location +mv $RPM_BUILD_ROOT/%{_lib}/paraview-mpi/* $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/ +rm -r $RPM_BUILD_ROOT/%{_lib}/paraview-mpi %endif #Install the normal version @@ -274,8 +302,12 @@ rm -r $RPM_BUILD_ROOT/usr/plugins rm $RPM_BUILD_ROOT%{_bindir}/assistant #Move the documentation -mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \ - $RPM_BUILD_ROOT%{_datadir}/paraview/ +#mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \ +# $RPM_BUILD_ROOT%{_datadir}/paraview/ + +#Move some stuff to the proper location +mv $RPM_BUILD_ROOT/%{_lib}/paraview/* $RPM_BUILD_ROOT%{_libdir}/paraview/ +rm -r $RPM_BUILD_ROOT/%{_lib}/paraview %clean @@ -302,8 +334,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) %doc License_v1.2.txt +%{_bindir}/lproj %{_bindir}/paraview %{_bindir}/pvbatch +%{_bindir}/pvblot %{_bindir}/pvdataserver %{_bindir}/pvpython %{_bindir}/pvrenderserver @@ -312,6 +346,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_bindir}/vtkSMExtractDocumentation %{_libdir}/paraview/ %exclude %{_libdir}/paraview/doc/ +%dir %{_datadir}/paraview +%doc %{_datadir}/paraview/about.html %if %{build_mpi} %files mpi @@ -328,7 +364,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files data %defattr(-,root,root,-) %{_datadir}/applications/fedora-paraview.desktop -%dir %{_datadir}/paraview %{_datadir}/pixmaps/paraview_22x22.png %{_datadir}/mime/packages/paraview.xml @@ -342,10 +377,14 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files doc %defattr(-,root,root,-) %doc %{_datadir}/paraview/pqClient.adp +%doc %{_datadir}/paraview/pqClientDocFinder.txt %doc %{_datadir}/paraview/Documentation/ %changelog +* Wed Jul 22 2009 Orion Poplawski - 3.6.1-1 +- Update to 3.6.1 + * Thu May 7 2009 Orion Poplawski - 3.4.0-5 - Update doc patch to look for help file in the right place (bug #499273) diff --git a/sources b/sources index f2db95f..6041838 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a12067913e08ea7a465ca41509dbfde1 paraview-3.4.0.tar.gz +becbff0b9989b1b788dba75c4289ee7e paraview-3.6.1.tar.gz