From 79e9a3ab7fdf7647913b2fa0b36bb2ccc99fc965 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: May 20 2008 19:28:52 +0000 Subject: - Update to 3.3.0 CVS snapshot - Update qt and gcc43 patches, drop unneeded patches - Add openssl-devel, gnuplot, and wget BRs - Update license text filename - Set VTK_USE_RPATH to off, needed with development versions - Run ctest in %check - still need to exclude more tests --- diff --git a/.cvsignore b/.cvsignore index 8b69f47..8e7d953 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -paraview-3.2.1.tar.gz +ParaView3.3.0-20080520.tar.gz diff --git a/paraview-3.2-qt.patch b/paraview-3.2-qt.patch deleted file mode 100644 index d5e0978..0000000 --- a/paraview-3.2-qt.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ParaView3.2/Qt/CMakeLists.txt.qt 2007-11-09 14:21:59.000000000 -0700 -+++ ParaView3.2/Qt/CMakeLists.txt 2007-11-09 14:22:11.000000000 -0700 -@@ -10,14 +10,6 @@ - MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. Please check the QT_QMAKE_EXECUTABLE variable.") - ELSE(NOT QT4_FOUND) - --# To make support of ParaView tractable, we only support a single version --# of Qt at one time. If you really want to use a newer version of Qt, you --# can delete this check, but you are on your own. --STRING(REGEX MATCH "^4\\.2\\.[0-9]+" qt_version_tmp "${QTVERSION}") --IF (NOT qt_version_tmp) -- MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.2.") --ENDIF (NOT qt_version_tmp) -- - # help CMake fine QtUiTools on Mac (binary install) - IF(Q_WS_MAC AND QT4_FOUND AND QT_QTCORE_FOUND AND NOT QT_QTUITOOLS_FOUND) - FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools PATHS ${QT_LIBRARY_DIR}) diff --git a/paraview-3.2.1-gcc43.patch b/paraview-3.2.1-gcc43.patch deleted file mode 100644 index 449ce1b..0000000 --- a/paraview-3.2.1-gcc43.patch +++ /dev/null @@ -1,140 +0,0 @@ ---- ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 -+++ ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-02-14 15:57:15.000000000 -0700 -@@ -29,6 +29,7 @@ - #include "DICOMAppHelper.h" - #include "DICOMCallback.h" - -+#include - #include - #include - #include ---- ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMFile.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 -+++ ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMFile.cxx 2008-02-18 10:31:08.000000000 -0700 -@@ -26,7 +26,7 @@ - #include "DICOMFile.h" - - #include --#include -+#include - - DICOMFile::DICOMFile() : InputStream() - { ---- ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMParser.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 -+++ ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMParser.cxx 2008-02-18 10:33:07.000000000 -0700 -@@ -39,7 +39,7 @@ - #include - #endif - --#include -+#include - - // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr - // #define DEBUG_DICOM ---- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaUtils.cxx.gcc43 2007-11-07 13:52:00.000000000 -0700 -+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaUtils.cxx 2008-02-18 10:34:46.000000000 -0700 -@@ -34,7 +34,7 @@ - #endif - - #include --#include -+#include - - #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580) - #include ---- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaUtils.h.gcc43 2007-11-07 13:52:00.000000000 -0700 -+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaUtils.h 2008-02-18 10:36:19.000000000 -0700 -@@ -51,7 +51,7 @@ - #endif - - #include --#include -+#include - #include - - ---- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaCommand.cxx.gcc43 2007-11-07 13:52:00.000000000 -0700 -+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaCommand.cxx 2008-02-18 10:41:22.000000000 -0700 -@@ -21,7 +21,7 @@ - #include "metaCommand.h" - - #include --#include -+#include - - #if (METAIO_USE_NAMESPACE) - namespace METAIO_NAMESPACE { ---- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaImage.cxx.gcc43 2007-11-07 13:52:00.000000000 -0700 -+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaImage.cxx 2008-02-18 10:44:29.000000000 -0700 -@@ -18,7 +18,8 @@ - - #include - #include --#include -+#include -+#include - #include // for memcpy - #include - ---- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaOutput.cxx.gcc43 2007-11-07 13:52:00.000000000 -0700 -+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaOutput.cxx 2008-02-18 10:47:24.000000000 -0700 -@@ -32,6 +32,7 @@ - #include - #endif - -+#include - #include - - #if (METAIO_USE_NAMESPACE) ---- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h.gcc43 2007-11-07 13:51:40.000000000 -0700 -+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h 2008-02-18 11:38:06.000000000 -0700 -@@ -26,7 +26,7 @@ - #define __XdmfLightData_h - - #include "XdmfObject.h" -- -+#include - - // typedef XdmfPointer XdmfXmlNode; - struct _xmlNode; ---- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700 -+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx 2008-02-18 11:42:04.000000000 -0700 -@@ -23,6 +23,7 @@ - /* */ - /*******************************************************************/ - #include "XdmfObject.h" -+#include - - static XdmfInt32 GlobalDebugFlag = 0; - static XdmfInt64 NameCntr = 0; ---- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfRoot.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700 -+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfRoot.cxx 2008-02-18 11:43:10.000000000 -0700 -@@ -24,6 +24,7 @@ - /*******************************************************************/ - #include "XdmfRoot.h" - #include "XdmfDOM.h" -+#include - - XdmfRoot::XdmfRoot() { - this->SetElementName("Xdmf"); ---- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h.gcc43 2007-11-07 13:51:40.000000000 -0700 -+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-02-29 21:23:35.000000000 -0700 -@@ -26,6 +26,8 @@ - #define __XdmfArray_h - - #include "XdmfDataDesc.h" -+#include -+#include - - #define XDMF_LONGEST_LENGTH (XdmfInt64)~0 - #define XDMF_ARRAY_TAG_LENGTH 80 ---- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700 -+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-02-29 22:13:27.000000000 -0700 -@@ -23,6 +23,8 @@ - /* */ - /*******************************************************************/ - #include "XdmfDataDesc.h" -+#include -+#include - - XdmfDataDesc::XdmfDataDesc() { - H5dont_atexit(); diff --git a/paraview-3.2.1-install.patch b/paraview-3.2.1-install.patch deleted file mode 100644 index 66bb4da..0000000 --- a/paraview-3.2.1-install.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- ParaView3.2.1/Applications/Client/CMakeLists.txt.install 2007-11-19 16:02:42.000000000 -0700 -+++ ParaView3.2.1/Applications/Client/CMakeLists.txt 2007-11-20 09:14:25.000000000 -0700 -@@ -451,53 +451,6 @@ - COMPONENT Runtime) - ENDIF(NOT Q_WS_MAC) - --# Install system libraries on Linux (will not work on any other Unix --# yet) --FOREACH(fmpglib avcodec avformat avutil) -- IF(FFMPEG_${fmpglib}_LIBRARY) -- GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH) -- GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME) -- FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*") -- INSTALL(CODE " --MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${FFMPEG_LIB_NAME_tmp}\") --EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp} -- COMMAND tar c ${FFMPEG_LIB_LIST} -- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}) -- " COMPONENT Runtime) -- #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR_CM24}) -- -- ENDIF(FFMPEG_${fmpglib}_LIBRARY) --ENDFOREACH(fmpglib) -- --SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST) --# the variable and library names are not the same --IF (WIN32) -- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT) --ELSE (WIN32) -- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT) --ENDIF (WIN32) -- --IF(NOT Q_WS_MAC) -- FOREACH(qtlib ${QTLIBLIST}) -- IF (NOT WIN32) -- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24}) -- 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) -- ENDIF (NOT WIN32) -- -- ENDFOREACH(qtlib) --ENDIF(NOT Q_WS_MAC) -- - # Hard-coded install rules for anything left to install. These should - # probably go to a local cmake file. Change to match the build system's - # libraries -@@ -510,21 +463,6 @@ - DESTINATION ${PV_EXE_INSTALL_CM24} - PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ - COMPONENT Runtime) --ELSE(WIN32) -- IF (NOT Q_WS_MAC) -- IF(PV_NEED_SHARED_FORWARD) -- INSTALL(FILES ${QT_BINARY_DIR}/assistant -- DESTINATION ${PV_EXE_INSTALL_CM24} -- PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ -- COMPONENT Runtime -- RENAME assistant-real) -- ELSE(PV_NEED_SHARED_FORWARD) -- INSTALL(FILES ${QT_BINARY_DIR}/assistant -- DESTINATION ${PV_EXE_INSTALL_CM24} -- PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ -- COMPONENT Runtime) -- ENDIF(PV_NEED_SHARED_FORWARD) -- ENDIF (NOT Q_WS_MAC) - ENDIF(WIN32) - - # Call this one last so that it happens after the above targets are all installed: diff --git a/paraview-3.2.1-make.patch b/paraview-3.2.1-make.patch deleted file mode 100644 index 9245fb2..0000000 --- a/paraview-3.2.1-make.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: VTK/Examples/CMakeLists.txt -=================================================================== -RCS file: /cvsroot/ParaView3/ParaView3/VTK/Examples/CMakeLists.txt,v -retrieving revision 1.34 -retrieving revision 1.35 -diff -u -r1.34 -r1.35 ---- VTK/Examples/CMakeLists.txt 2 Aug 2007 21:58:03 -0000 1.34 -+++ VTK/Examples/CMakeLists.txt 19 Dec 2007 20:22:39 -0000 1.35 -@@ -115,6 +115,12 @@ - IF(VTK_USE_PARALLEL) - ADD_DEPENDENCIES(VTKExamplesTarget vtkParallel) - ENDIF(VTK_USE_PARALLEL) -+ IF(VTK_USE_INFOVIS) -+ ADD_DEPENDENCIES(VTKExamplesTarget vtkInfovis) -+ ENDIF(VTK_USE_INFOVIS) -+ IF(VTK_USE_VIEWS) -+ ADD_DEPENDENCIES(VTKExamplesTarget vtkViews) -+ ENDIF(VTK_USE_VIEWS) - IF(VTK_USE_QVTK) - ADD_DEPENDENCIES(VTKExamplesTarget QVTK) - ENDIF(VTK_USE_QVTK) diff --git a/paraview-3.3.0-gcc43.patch b/paraview-3.3.0-gcc43.patch new file mode 100644 index 0000000..160c86d --- /dev/null +++ b/paraview-3.3.0-gcc43.patch @@ -0,0 +1,93 @@ +--- ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 ++++ ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-02-14 15:57:15.000000000 -0700 +@@ -29,6 +29,7 @@ + #include "DICOMAppHelper.h" + #include "DICOMCallback.h" + ++#include + #include + #include + #include +--- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaImage.cxx.gcc43 2007-11-07 13:52:00.000000000 -0700 ++++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaImage.cxx 2008-02-18 10:44:29.000000000 -0700 +@@ -18,7 +18,8 @@ + + #include + #include +-#include ++#include ++#include + #include // for memcpy + #include + +--- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaOutput.cxx.gcc43 2007-11-07 13:52:00.000000000 -0700 ++++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaOutput.cxx 2008-02-18 10:47:24.000000000 -0700 +@@ -32,6 +32,7 @@ + #include + #endif + ++#include + #include + + #if (METAIO_USE_NAMESPACE) +--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h.gcc43 2007-11-07 13:51:40.000000000 -0700 ++++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h 2008-02-18 11:38:06.000000000 -0700 +@@ -26,7 +26,7 @@ + #define __XdmfLightData_h + + #include "XdmfObject.h" +- ++#include + + // typedef XdmfPointer XdmfXmlNode; + struct _xmlNode; +--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700 ++++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx 2008-02-18 11:42:04.000000000 -0700 +@@ -23,6 +23,7 @@ + /* */ + /*******************************************************************/ + #include "XdmfObject.h" ++#include + + static XdmfInt32 GlobalDebugFlag = 0; + static XdmfInt64 NameCntr = 0; +--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfRoot.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700 ++++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfRoot.cxx 2008-02-18 11:43:10.000000000 -0700 +@@ -24,6 +24,7 @@ + /*******************************************************************/ + #include "XdmfRoot.h" + #include "XdmfDOM.h" ++#include + + XdmfRoot::XdmfRoot() { + this->SetElementName("Xdmf"); +--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h.gcc43 2007-11-07 13:51:40.000000000 -0700 ++++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-02-29 21:23:35.000000000 -0700 +@@ -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/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700 ++++ ParaView3.3.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-02-29 22:13:27.000000000 -0700 +@@ -23,6 +23,7 @@ + /* */ + /*******************************************************************/ + #include "XdmfDataDesc.h" ++#include + + XdmfDataDesc::XdmfDataDesc() { + H5dont_atexit(); +--- ParaView3.3.0-20080512/Utilities/Xdmf2/libsrc/XdmfDataDesc.h.gcc43 2008-02-21 09:55:28.000000000 -0700 ++++ ParaView3.3.0-20080512/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-05-12 16:51:07.000000000 -0600 +@@ -27,6 +27,7 @@ + + #include "XdmfObject.h" + #include "XdmfHDFSupport.h" ++#include + + #define XDMF_SELECTALL 0 + #define XDMF_HYPERSLAB 1 diff --git a/paraview.spec b/paraview.spec index 48c0b08..fa352dc 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,27 +1,31 @@ %{!?build_mpi:%define build_mpi 1} %define pv_maj 3 -%define pv_min 2 -%define pv_patch 1 +%define pv_min 3 +%define pv_patch 0 %define pv_majmin %{pv_maj}.%{pv_min} +%define cvsdate 20080520 Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 5%{?dist} +Release: 0.%{cvsdate}.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 +Source0: ParaView%{version}-%{cvsdate}.tar.gz Source1: paraview_22x22.png Source2: paraview.xml -Patch0: paraview-3.2-qt.patch +#ParaView only officially supports a specific Qt version, but we +#need to use whatever we have. This disables the versoin check. +Patch0: paraview-3.3.0-qt.patch Patch1: paraview-3.2.1-rpath.patch -Patch2: paraview-3.2.1-install.patch Patch3: paraview-3.2.1-doc.patch Patch4: paraview-3.2.1-assistant-qt4.patch -Patch5: paraview-3.2.1-make.patch -Patch6: paraview-3.2.1-gcc43.patch +#Reported upstream: http://public.kitware.com/Bug/view.php?id=7022 +Patch6: paraview-3.3.0-gcc43.patch +#Reported upstream: http://public.kitware.com/Bug/view.php?id=7023 Patch7: paraview-3.2.1-hdf5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,6 +40,9 @@ BuildRequires: expat-devel BuildRequires: /usr/bin/desktop-file-install BuildRequires: doxygen, graphviz BuildRequires: readline-devel +BuildRequires: openssl-devel +BuildRequires: gnuplot +BuildRequires: wget Requires: %{name}-data = %{version}-%{release} Requires: qt4-assistant Requires(post): /usr/bin/update-desktop-database @@ -119,15 +126,15 @@ Requires: %{name}-mpi = %{version}-%{release} %prep -%setup -q -n ParaView%{version} +%setup -q -n ParaView%{version}-%{cvsdate} %patch -p1 -b .qt %patch1 -p1 -b .rpath -%patch2 -p1 -b .install %patch3 -p1 -b .doc %patch4 -p1 -b .assistant-qt4 -%patch5 -p0 -b .make %patch6 -p1 -b .gcc43 %patch7 -p1 -b .hdf5 +#Remove included hdf5 just to be sure +rm -r Utilities/hdf5 %build @@ -149,6 +156,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API" -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 \ @@ -157,7 +165,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API" -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON -cmake .. make VERBOSE=1 %{?_smp_mflags} popd %if %{build_mpi} @@ -182,6 +189,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API" -DMPI_LIBRARY:STRING="-L%{_libdir}/openmpi" \ -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 \ @@ -190,7 +198,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API" -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON -cmake .. make VERBOSE=1 %{?_smp_mflags} %endif @@ -286,6 +293,23 @@ popd #Don't ship the VTK Qt Designer plugin rm -r $RPM_BUILD_ROOT/usr/plugins +#Don't ship assistant +rm $RPM_BUILD_ROOT/%{_bindir}/assistant{,-mpi} + + +%check +for dir in fedora fedora-mpi +do + pushd $dir +# Exclude the following tests: +# QVTK-TestQtSQLDatabase - Needs a SQL database server +# Mace - Needs X Display +# pq* - Needs X Display +# XXX - There are still a lot of failing tests. Need to investigate further + ctest -V -E '^(QVTK-TestQtSQLDatabase|Mace|pq)' || : + popd +done + %clean rm -rf $RPM_BUILD_ROOT @@ -320,7 +344,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) -%doc License_v1.1.txt +%doc License_v1.2.txt %{_sysconfdir}/ld.so.conf.d/paraview-%{_arch}.conf %{_bindir}/paraview %{_bindir}/pvbatch @@ -338,7 +362,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %if %{build_mpi} %files mpi %defattr(-,root,root,-) -%doc License_v1.1.txt +%doc License_v1.2.txt %{_sysconfdir}/ld.so.conf.d/paraview-mpi-%{_arch}.conf %{_bindir}/paraview-mpi %{_bindir}/pvbatch-mpi @@ -370,6 +394,14 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Wed May 20 2008 - Orion Poplawski - 3.3.0-0.20080520.1 +- Update to 3.3.0 CVS snapshot +- Update qt and gcc43 patches, drop unneeded patches +- Add openssl-devel, gnuplot, and wget BRs +- Update license text filename +- Set VTK_USE_RPATH to off, needed with development versions +- Run ctest in %%check - still need to exclude more tests + * Wed Mar 5 2008 - Orion Poplawski - 3.2.1-5 - Rebuild for hdf5 1.8.0 using compatability API define and new patch diff --git a/sources b/sources index 333d8e0..62ade7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -050830112537c477a1cb20370caded50 paraview-3.2.1.tar.gz +c39e69f0b72196b7cfc725d88ae707d0 ParaView3.3.0-20080520.tar.gz