diff --git a/.cvsignore b/.cvsignore index e9904d9..5df6452 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -paraview-3.6.2.tar.gz +ParaView-3.8.0.tar.gz diff --git a/paraview-3.4.0-hdf5-1.8.2.patch b/paraview-3.4.0-hdf5-1.8.2.patch deleted file mode 100644 index d4d3d6f..0000000 --- a/paraview-3.4.0-hdf5-1.8.2.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- ParaView-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.hdf5-1.8.2 2009-02-24 14:13:53.000000000 -0700 -+++ ParaView-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2009-02-24 15:34:49.000000000 -0700 -@@ -133,9 +133,15 @@ - static herr_t H5FD_dsm_flush(H5FD_t *_file); - #endif - static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2); -+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) -+static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type); -+static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr); -+static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file); -+#else - static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file); - static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr); - static haddr_t H5FD_dsm_get_eof(H5FD_t *_file); -+#endif - static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, - DSM_HSIZE_T size, void *buf); - static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, -@@ -160,6 +166,9 @@ - H5FD_dsm_close, /*close */ - H5FD_dsm_cmp, /*cmp */ - NULL, /*query */ -+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>9)||((H5_VERS_MINOR==8)&&(H5_VERS_RELEASE>=2)))) -+ NULL, /*get_type_map */ -+#endif - NULL, /*alloc */ - NULL, /*free */ - H5FD_dsm_get_eoa, /*get_eoa */ -@@ -169,6 +178,9 @@ - H5FD_dsm_read, /*read */ - H5FD_dsm_write, /*write */ - NULL, /*flush */ -+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>9)||((H5_VERS_MINOR==8)&&(H5_VERS_RELEASE>=2)))) -+ NULL, /*truncate */ -+#endif - NULL, /*lock */ - NULL, /*unlock */ - H5FD_FLMAP_SINGLE /*fl_map */ -@@ -595,7 +607,11 @@ - *------------------------------------------------------------------------- - */ - static haddr_t -+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) -+H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type) -+#else - H5FD_dsm_get_eoa(H5FD_t *_file) -+#endif - { - H5FD_dsm_t *file = (H5FD_dsm_t*)_file; - -@@ -623,7 +639,11 @@ - *------------------------------------------------------------------------- - */ - static herr_t -+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) -+H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) -+#else - H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr) -+#endif - { - H5FD_dsm_t *file = (H5FD_dsm_t*)_file; - -@@ -664,7 +684,11 @@ - *------------------------------------------------------------------------- - */ - static haddr_t -+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) -+H5FD_dsm_get_eof(const H5FD_t *_file) -+#else - H5FD_dsm_get_eof(H5FD_t *_file) -+#endif - { - H5FD_dsm_t *file = (H5FD_dsm_t*)_file; - diff --git a/paraview-3.6.0-assistant-qt4.patch b/paraview-3.6.0-assistant-qt4.patch deleted file mode 100644 index 4729ec6..0000000 --- a/paraview-3.6.0-assistant-qt4.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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_adp"; - #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_adp"; - #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 deleted file mode 100644 index 600ad52..0000000 --- a/paraview-3.6.0-install.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- 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) ---- ParaView3/Applications/StreamingParaView/CMakeLists.txt.install 2009-03-04 07:24:27.000000000 -0700 -+++ ParaView3/Applications/StreamingParaView/CMakeLists.txt 2010-02-17 14:17:54.608736889 -0700 -@@ -201,16 +201,6 @@ - IF(NOT Q_WS_MAC) - 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-demo.patch b/paraview-3.6.1-demo.patch deleted file mode 100644 index 383de4f..0000000 --- a/paraview-3.6.1-demo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index d741582..0000000 --- a/paraview-3.6.1-doc.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- 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 deleted file mode 100644 index ac505ff..0000000 --- a/paraview-3.6.1-plugins.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 "${PV_INSTALL_LIB_DIR}/plugins/${name}" - COMPONENT Runtime) - ENDIF (PV_INSTALL_BIN_DIR) - ENDMACRO(internal_paraview_install_plugin) diff --git a/paraview-3.8.0-demo.patch b/paraview-3.8.0-demo.patch new file mode 100644 index 0000000..320d4e2 --- /dev/null +++ b/paraview-3.8.0-demo.patch @@ -0,0 +1,10 @@ +--- ParaView-3.8.0/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt.demo 2010-05-27 11:04:39.000000000 -0600 ++++ ParaView-3.8.0/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2010-06-02 09:45:44.105517239 -0600 +@@ -4,7 +4,3 @@ + add_executable(${exe} PointSpriteDemo.cxx) + + target_link_libraries(${exe} PointSprite_Rendering vtkIO) +- +-install(TARGETS ${exe} +- RUNTIME DESTINATION ${PROJECT_BINARY_DIR} +-) diff --git a/paraview-3.8.0-hdf5-1.8.patch b/paraview-3.8.0-hdf5-1.8.patch new file mode 100644 index 0000000..32a8f4d --- /dev/null +++ b/paraview-3.8.0-hdf5-1.8.patch @@ -0,0 +1,11 @@ +--- ParaView-3.8.0-RC1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.hdf5-1.8 2010-03-18 09:24:25.000000000 -0600 ++++ ParaView-3.8.0-RC1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2010-04-20 13:27:30.966346738 -0600 +@@ -729,7 +729,7 @@ + status = H5Tinsert( this->DataType, + Name, + Offset, +-#if (!H5_USE_16_API_DEFAULT && ((H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)))) ++#if (!H5_USE_16_API && ((H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)))) + H5Tarray_create( HNumberType, rank, Dims)); + #else + H5Tarray_create( HNumberType, rank, Dims, NULL )); diff --git a/paraview-3.8.0-include.patch b/paraview-3.8.0-include.patch new file mode 100644 index 0000000..cfae01d --- /dev/null +++ b/paraview-3.8.0-include.patch @@ -0,0 +1,10 @@ +--- ParaView-3.8.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.h.include 2009-11-27 02:56:17.000000000 -0700 ++++ ParaView-3.8.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2010-04-19 13:59:05.609711395 -0600 +@@ -27,6 +27,7 @@ + + #include "XdmfObject.h" + #include "XdmfHDFSupport.h" ++#include + + #define XDMF_SELECTALL 0 + #define XDMF_HYPERSLAB 1 diff --git a/paraview-3.8.0-installpath.patch b/paraview-3.8.0-installpath.patch new file mode 100644 index 0000000..42b066a --- /dev/null +++ b/paraview-3.8.0-installpath.patch @@ -0,0 +1,56 @@ +From 07ba5364f3ab16d33e7ae7c67f64c4b25e2de11f Mon Sep 17 00:00:00 2001 +From: Utkarsh Ayachit +Date: Thu, 3 Jun 2010 09:49:23 -0400 +Subject: [PATCH] Paraview clients were ignoring set install path. + +The ParaView custom clients were not passing the PV_INSTALL_LIB_DIR to the +build_paraview_client macro. As a consequence it was doing the default thing. +Fixed that. +--- + Applications/AdaptiveParaView/CMakeLists.txt | 2 ++ + Applications/ParaView/CMakeLists.txt | 2 ++ + Applications/StreamingParaView/CMakeLists.txt | 2 ++ + 3 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/Applications/AdaptiveParaView/CMakeLists.txt b/Applications/AdaptiveParaView/CMakeLists.txt +index f93cd01..a951229 100644 +--- a/Applications/AdaptiveParaView/CMakeLists.txt ++++ b/Applications/AdaptiveParaView/CMakeLists.txt +@@ -45,6 +45,8 @@ build_paraview_client(adaptive_paraview + ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomFilters.xml + ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomSources.xml + SOURCES ${Application_SOURCE_FILES} ++ INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}" ++ INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}" + ) + + ADD_EXECUTABLE(ppRawStridedReader2 ppRawStridedReader2.cxx) +diff --git a/Applications/ParaView/CMakeLists.txt b/Applications/ParaView/CMakeLists.txt +index 6ec9d99..75de3ed 100644 +--- a/Applications/ParaView/CMakeLists.txt ++++ b/Applications/ParaView/CMakeLists.txt +@@ -63,6 +63,8 @@ build_paraview_client(paraview + ${PARAVIEW_EXTRA_GUI_RESOURCES} # Add any compiled in GUI configuration xmls + COMPRESSED_HELP_FILE "${ParaView_BINARY_DIR}/Documentation/paraview.qch" + SOURCES ${ParaView_SOURCE_FILES} ++ INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}" ++ INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}" + ) + + # Configure the ".plugins" configuration xml for making paraview aware of the +diff --git a/Applications/StreamingParaView/CMakeLists.txt b/Applications/StreamingParaView/CMakeLists.txt +index e113172..c39f768 100644 +--- a/Applications/StreamingParaView/CMakeLists.txt ++++ b/Applications/StreamingParaView/CMakeLists.txt +@@ -45,6 +45,8 @@ build_paraview_client(streaming_paraview + ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomFilters.xml + ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomSources.xml + SOURCES ${Application_SOURCE_FILES} ++ INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}" ++ INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}" + ) + + IF(FALSE)#BUILD_TESTING) +-- +1.7.0 + diff --git a/paraview.spec b/paraview.spec index a704a5b..722d0a9 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,41 +1,37 @@ %{!?build_openmpi:%global build_openmpi 1} %{!?build_mpich2:%global build_mpich2 1} %define pv_maj 3 -%define pv_min 6 -%define pv_patch 2 +%define pv_min 8 +%define pv_patch 0 %define pv_majmin %{pv_maj}.%{pv_min} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} + Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Parallel visualization application Group: Applications/Engineering License: BSD URL: http://www.paraview.org/ -Source0: http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz +Source0: http://www.paraview.org/files/v%{pv_majmin}/ParaView-%{version}.tar.gz Source1: paraview_22x22.png Source2: paraview.xml #Add needed link libraries #http://public.kitware.com/Bug/view.php?id=10298 Patch0: paraview-3.6.2-libs.patch -#Don't try to copy Qt libraries into paraview directory -Patch2: paraview-3.6.0-install.patch -#Move pqClient.adp into %{_datadir}/paraview -Patch3: paraview-3.6.1-doc.patch -#Reported upstream: http://public.kitware.com/Bug/view.php?id=9458 -#Look for assistant_adp instead of assistant -Patch4: paraview-3.6.0-assistant-qt4.patch -#Reported upstream: http://public.kitware.com/Bug/view.php?id=7022 +#Add some needed includes +Patch1: paraview-3.8.0-include.patch +#Upstream patch to fix install paths +Patch2: paraview-3.8.0-installpath.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 +Patch5: paraview-3.8.0-demo.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 +#Change H5_USE_16_API_DEFAULT to H5_USE_16_API +Patch8: paraview-3.8.0-hdf5-1.8.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -208,15 +204,13 @@ BuildArch: noarch %prep -%setup -q -n ParaView3 +%setup -q -n ParaView-%{version} %patch0 -p1 -b .libs -%patch2 -p1 -b .install -%patch3 -p1 -b .doc -%patch4 -p1 -b .assistant-qt4 +%patch1 -p1 -b .include +%patch2 -p1 -b .installpath %patch5 -p1 -b .demo -%patch6 -p1 -b .plugins %patch7 -p1 -b .hdf5 -%patch8 -p1 -b .hdf5-1.8.2 +%patch8 -p1 -b .hdf5-1.8 #Remove included hdf5 just to be sure rm -r Utilities/hdf5 @@ -301,15 +295,12 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages pushd fedora-openmpi make install DESTDIR=$RPM_BUILD_ROOT -#Don't ship copy of Qt assisstant -rm $RPM_BUILD_ROOT%{_libdir}/openmpi/bin/assistant \ - $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/assistant-real #Cleanup %{_bindir} pushd $RPM_BUILD_ROOT/%{_libdir}/openmpi/bin #Don't need mpi versions of these -rm lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation +rm lproj pvblot pvpython #Move the remaining mpi binaries out of the way -for f in pvbatch pvdataserver pvrenderserver pvserver +for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver do mv $f ${f}_openmpi done @@ -326,15 +317,12 @@ popd pushd fedora-mpich2 make install DESTDIR=$RPM_BUILD_ROOT -#Don't ship copy of Qt assisstant -rm $RPM_BUILD_ROOT%{_libdir}/mpich2/bin/assistant \ - $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/assistant-real #Cleanup %{_bindir} pushd $RPM_BUILD_ROOT/%{_libdir}/mpich2/bin #Don't need mpi versions of these -rm lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation +rm lproj pvblot pvpython #Move the remaining mpi binaries out of the way -for f in pvbatch pvdataserver pvrenderserver pvserver +for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver do mv $f ${f}_mpich2 done @@ -375,16 +363,9 @@ popd #Don't ship the VTK Qt Designer plugin rm -r $RPM_BUILD_ROOT/usr/plugins -#Don't ship copy of Qt assisstant -rm $RPM_BUILD_ROOT%{_bindir}/assistant \ - $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real #Don't ship lproj - provided by vtk rm $RPM_BUILD_ROOT%{_bindir}/lproj -#Move the documentation -#mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \ -# $RPM_BUILD_ROOT%{_datadir}/paraview/ - %clean rm -rf $RPM_BUILD_ROOT @@ -417,12 +398,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_bindir}/pvpython %{_bindir}/pvrenderserver %{_bindir}/pvserver -%{_bindir}/pvTestDriver -%{_bindir}/vtkSMExtractDocumentation +%{_bindir}/smTestDriver +%{_bindir}/streaming_paraview %{_libdir}/paraview/ %exclude %{_libdir}/paraview/doc/ +%{python_sitelib}/Xdmf/ %dir %{_datadir}/paraview -%doc %{_datadir}/paraview/about.html + %if %{build_mpich2} %files openmpi @@ -432,6 +414,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/openmpi/bin/pvdataserver_openmpi %{_libdir}/openmpi/bin/pvrenderserver_openmpi %{_libdir}/openmpi/bin/pvserver_openmpi +%{_libdir}/openmpi/bin/smTestDriver_openmpi %{_libdir}/openmpi/lib/paraview %endif @@ -444,6 +427,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/mpich2/bin/pvdataserver_mpich2 %{_libdir}/mpich2/bin/pvrenderserver_mpich2 %{_libdir}/mpich2/bin/pvserver_mpich2 +%{_libdir}/mpich2/bin/smTestDriver_mpich2 %{_libdir}/mpich2/lib/paraview %endif @@ -463,12 +447,20 @@ 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/ +#doc %{_datadir}/paraview/pqClient.adp +#doc %{_datadir}/paraview/pqClientDocFinder.txt +#doc %{_datadir}/paraview/Documentation/ %changelog +* Tue Jun 1 2010 Orion Poplawski - 3.8.0-1 +- Update to 3.8.0 +- Update demo patch +- Update hdf5 patch +- Drop old documentation patches +- Add patch to add needed include headers +- Add patch from upstream to fix install path issue + * Sat Mar 13 2010 Kevin Kofler - 3.6.2-4 - BR qt-assistant-adp-devel - Don't Require qt4-assistant, should be qt-assistant-adp now, and it (or qt-x11 diff --git a/sources b/sources index c39a44d..a7e7d9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c004eb82e291452efb45527745a78e4 paraview-3.6.2.tar.gz +4f371631c373452b202a3d91f2cca12f ParaView-3.8.0.tar.gz