rpms/paraview/devel paraview-3.2.2-hdf5-1.8.patch, NONE, 1.1 paraview-3.2.2-hdf5.patch, NONE, 1.1 paraview-3.3.0-doc.patch, NONE, 1.1 paraview-3.3.0-install.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 paraview-3.3.0-gcc43.patch, 1.1, 1.2 paraview.spec, 1.24, 1.25 sources, 1.6, 1.7 paraview-3.2.1-doc.patch, 1.1, NONE paraview-3.2.1-hdf5.patch, 1.1, NONE paraview-3.2.1-rpath.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Fri Aug 15 17:12:23 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6877
Modified Files:
.cvsignore paraview-3.3.0-gcc43.patch paraview.spec sources
Added Files:
paraview-3.2.2-hdf5-1.8.patch paraview-3.2.2-hdf5.patch
paraview-3.3.0-doc.patch paraview-3.3.0-install.patch
Removed Files:
paraview-3.2.1-doc.patch paraview-3.2.1-hdf5.patch
paraview-3.2.1-rpath.patch
Log Message:
* Mon Aug 11 2008 Orion Poplawski <orion at cora.nwra.com> - 3.3.1-0.20080811.1
- Update 3.3.1 CVS snapshot
- Update hdf5 patch to drop upstreamed changes
- Fix mpi build (bug #450598)
- Use rpath instead of ls.so conf files so mpi and non-mpi can be installed at
the same time
- mpi package now just ships mpi versions of the server components
- Drop useless mpi-devel subpackage
- Update hdf5 patch to fix H5pubconf.h -> H5public.h usage
paraview-3.2.2-hdf5-1.8.patch:
--- NEW FILE paraview-3.2.2-hdf5-1.8.patch ---
--- ParaView3.2.2/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.hdf5-1.8 2008-07-16 11:24:23.000000000 -0600
+++ ParaView3.2.2/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-07-16 11:54:06.000000000 -0600
@@ -132,9 +132,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,
@@ -594,7 +600,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;
@@ -622,7 +632,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;
@@ -663,7 +677,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;
paraview-3.2.2-hdf5.patch:
--- NEW FILE paraview-3.2.2-hdf5.patch ---
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfH5Driver.h.hdf5 2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfH5Driver.h 2008-06-26 16:31:16.000000000 -0600
@@ -27,7 +27,7 @@
#include "XdmfDsmBuffer.h"
#include "H5Ipublic.h"
-#include "H5pubconf.h"
+#include "H5public.h"
#include "XdmfExport.h"
paraview-3.3.0-doc.patch:
--- NEW FILE paraview-3.3.0-doc.patch ---
--- 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.3.0-install.patch:
--- NEW FILE paraview-3.3.0-install.patch ---
--- 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)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 20 May 2008 19:28:52 -0000 1.6
+++ .cvsignore 15 Aug 2008 17:11:53 -0000 1.7
@@ -1 +1 @@
-ParaView3.3.0-20080520.tar.gz
+ParaView3.3.1-20080811.tar.gz
paraview-3.3.0-gcc43.patch:
Index: paraview-3.3.0-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview-3.3.0-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paraview-3.3.0-gcc43.patch 20 May 2008 19:28:52 -0000 1.1
+++ paraview-3.3.0-gcc43.patch 15 Aug 2008 17:11:53 -0000 1.2
@@ -1,68 +1,5 @@
---- 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 <cstring>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string>
---- 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 <stdio.h>
- #include <ctype.h>
--#include <string>
-+#include <cstring>
-+#include <cstdlib>
- #include <string.h> // for memcpy
- #include <math.h>
-
---- 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 <arpa/inet.h>
- #endif
-
-+#include <cstring>
- #include <typeinfo>
-
- #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 <cstring>
-
- // 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 <cstring>
-
- 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 <cstdlib>
-
- 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
+--- 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
@@ -71,18 +8,18 @@
#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
+--- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.gcc43 2008-07-15 17:22:46.000000000 -0600
++++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-07-16 12:03:40.000000000 -0600
@@ -23,6 +23,7 @@
/* */
/*******************************************************************/
#include "XdmfDataDesc.h"
+#include <cstdlib>
- 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
+ #include <stdlib.h>
+
+--- 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"
@@ -91,3 +28,45 @@
#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 <cstring>
+
+ #include <stdlib.h>
+
+--- ParaView3.3.0-20080715/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2008-05-12 15:29:35.000000000 -0600
++++ ParaView3.3.0-20080715/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-07-16 12:03:40.000000000 -0600
+@@ -29,6 +29,7 @@
+ #include "DICOMAppHelper.h"
+ #include "DICOMCallback.h"
+
++#include <cstring>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+--- ParaView3.3.0-20080715/VTK/Utilities/vtkmetaio/metaImage.cxx.gcc43 2008-05-20 08:58:16.000000000 -0600
++++ ParaView3.3.0-20080715/VTK/Utilities/vtkmetaio/metaImage.cxx 2008-07-16 12:03:40.000000000 -0600
+@@ -18,7 +18,8 @@
+
+ #include <stdio.h>
+ #include <ctype.h>
+-#include <string>
++#include <cstring>
++#include <cstdlib>
+ #include <string.h> // for memcpy
+ #include <stdlib.h> // for atoi
+ #include <math.h>
+--- ParaView3.3.0-20080715/VTK/Utilities/vtkmetaio/metaOutput.cxx.gcc43 2008-05-12 15:29:44.000000000 -0600
++++ ParaView3.3.0-20080715/VTK/Utilities/vtkmetaio/metaOutput.cxx 2008-07-16 12:03:40.000000000 -0600
+@@ -34,6 +34,7 @@
+
+ #include <string.h>
+
++#include <cstring>
+ #include <typeinfo>
+
+ #if (METAIO_USE_NAMESPACE)
Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- paraview.spec 20 May 2008 19:28:52 -0000 1.24
+++ paraview.spec 15 Aug 2008 17:11:53 -0000 1.25
@@ -1,9 +1,9 @@
%{!?build_mpi:%define build_mpi 1}
%define pv_maj 3
%define pv_min 3
-%define pv_patch 0
+%define pv_patch 1
%define pv_majmin %{pv_maj}.%{pv_min}
-%define cvsdate 20080520
+%define cvsdate 20080811
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
@@ -20,13 +20,16 @@
#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
-Patch3: paraview-3.2.1-doc.patch
+#Don't try to copy Qt libraries into paraview directory
+Patch2: paraview-3.3.0-install.patch
+#Move pqClient.adp into %{_datadir}/paraview
+Patch3: paraview-3.3.0-doc.patch
Patch4: paraview-3.2.1-assistant-qt4.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
+#Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
+Patch7: paraview-3.2.2-hdf5.patch
+Patch8: paraview-3.2.2-hdf5-1.8.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -47,7 +50,8 @@
Requires: qt4-assistant
Requires(post): /usr/bin/update-desktop-database
Requires(postun): /usr/bin/update-desktop-database
-Obsoletes: paraview-demos <= %{version}-%{release}
+Obsoletes: paraview-demos < %{version}-%{release}
+Provides: paraview-demos = %{version}-%{release}
%description
@@ -73,27 +77,13 @@
Summary: Parallel visualization application
Group: Applications/Engineering
Requires: %{name}-data = %{version}-%{release}
-Provides: %{name}
+Requires: openmpi
Requires(post): /usr/bin/update-desktop-database
Requires(postun): /usr/bin/update-desktop-database
%description mpi
-ParaView is an application designed with the need to visualize large data
-sets in mind. The goals of the ParaView project include the following:
-
- * Develop an open-source, multi-platform visualization application.
- * Support distributed computation models to process large data sets.
- * Create an open, flexible, and intuitive user interface.
- * Develop an extensible architecture based on open standards.
-
-ParaView runs on distributed and shared memory parallel as well as single
-processor systems and has been successfully tested on Windows, Linux and
-various Unix workstations and clusters. Under the hood, ParaView uses the
-Visualization Toolkit as the data processing and rendering engine and has a
-user interface written using a unique blend of Tcl/Tk and C++.
-
-NOTE: This version has been compiled with OpenMPI support and requires an
-operating OpenMPI runtime enviroment.
+This package contains copies of the ParaView server binaries compiled with
+OpenMPI. These are named pvserver-mpi, pvbatch-mpi, etc.
%endif
%package data
@@ -111,28 +101,22 @@
Summary: Development files for ParaView
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}
+Obsoletes: %{name}-mpi-devel < %{version}-%{release}
+Provides: %{name}-mpi-devel = %{version}-%{release}
%description devel
%{summary}.
-%package mpi-devel
-Summary: Development files for the mpi version of ParaView
-Group: Applications/Engineering
-Requires: %{name}-mpi = %{version}-%{release}
-
-%description mpi-devel
-%{summary}.
-
-
%prep
%setup -q -n ParaView%{version}-%{cvsdate}
-%patch -p1 -b .qt
-%patch1 -p1 -b .rpath
+%patch0 -p1 -b .qt
+%patch2 -p1 -b .install
%patch3 -p1 -b .doc
%patch4 -p1 -b .assistant-qt4
%patch6 -p1 -b .gcc43
%patch7 -p1 -b .hdf5
+%patch8 -p1 -b .hdf5-1.8
#Remove included hdf5 just to be sure
rm -r Utilities/hdf5
@@ -146,6 +130,7 @@
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 \
@@ -165,16 +150,19 @@
-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
+cmake ..
make VERBOSE=1 %{?_smp_mflags}
popd
%if %{build_mpi}
mkdir fedora-mpi
pushd fedora-mpi
export CC='gcc'
-export CXX='mpic++'
+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 \
@@ -182,11 +170,9 @@
-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_USE_MPI:BOOL=ON \
- -DMPI_INCLUDE_PATH:PATH="%{_includedir}/openmpi" \
- -DMPI_LIBRARY:STRING="-L%{_libdir}/openmpi" \
-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-DVTK_USE_INFOVIS:BOOL=OFF \
-DVTK_USE_RPATH:BOOL=OFF \
@@ -198,7 +184,10 @@
-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
+cmake ..
make VERBOSE=1 %{?_smp_mflags}
+popd
%endif
%install
@@ -209,6 +198,7 @@
# Create some needed directories
install -d $RPM_BUILD_ROOT%{_datadir}/applications
+install -d $RPM_BUILD_ROOT%{_datadir}/paraview
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
@@ -219,55 +209,30 @@
pushd fedora-mpi
make install DESTDIR=$RPM_BUILD_ROOT
-#ld.conf.d file
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/paraview-mpi > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/paraview-mpi-%{_arch}.conf
-
-#Create desktop file
-cat > paraview-mpi.desktop <<EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=ParaView Viewer MPI
-GenericName=Data Viewer
-Comment=ParaView allows MPI enabled viewing of large data sets
-Type=Application
-Terminal=false
-Icon=paraview_22x22
-MimeType=application/x-paraview;
-Categories=Application;Graphics;
-Exec=mpirun C paraview-mpi
-EOF
-
-desktop-file-install --vendor=fedora \
- --add-category=X-Fedora \
- --dir %{buildroot}%{_datadir}/applications/ \
- paraview-mpi.desktop
-
-popd
-
-#Move the mpi binaries, includes, and man pages out of the way
+#Cleanup %{_bindir}
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
+#Move the remaining mpi binaries out of the way
for f in *
do
mv $f ${f}-mpi
done
popd
-mv $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin} $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin}-mpi
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-#Remove mpi copy of documentation
-rm -rf $RPM_BUID_ROOT%{_datadir}/paraview/Documentation-mpi
-rm -rf $RPM_BUID_ROOT%{_libdir}/paraview-mpi/doc
+#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}
+popd
%endif
#Install the normal version
pushd fedora
make install DESTDIR=$RPM_BUILD_ROOT
-#ld.conf.d file
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/paraview > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/paraview-%{_arch}.conf
-
#Create desktop file
cat > paraview.desktop <<EOF
[Desktop Entry]
@@ -293,22 +258,12 @@
#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}
+#Don't ship copy of Qt assisstant
+rm $RPM_BUILD_ROOT%{_bindir}/assistant
-
-%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
+#Move the documentation
+mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \
+ $RPM_BUILD_ROOT%{_datadir}/paraview/
%clean
@@ -325,16 +280,6 @@
update-desktop-database &> /dev/null ||:
-%if %{build_mpi}
-%post mpi
-/sbin/ldconfig
-update-desktop-database &> /dev/null ||:
-
-%postun mpi
-/sbin/ldconfig
-update-desktop-database &> /dev/null ||:
-%endif
-
%post data
update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -345,7 +290,6 @@
%files
%defattr(-,root,root,-)
%doc License_v1.2.txt
-%{_sysconfdir}/ld.so.conf.d/paraview-%{_arch}.conf
%{_bindir}/paraview
%{_bindir}/pvbatch
%{_bindir}/pvdataserver
@@ -353,25 +297,20 @@
%{_bindir}/pvrenderserver
%{_bindir}/pvserver
%{_bindir}/pvTestDriver
-%doc %{_datadir}/paraview/
+%{_bindir}/vtkSMExtractDocumentation
%{_datadir}/applications/fedora-paraview.desktop
+%doc %{_datadir}/paraview/
%{_libdir}/paraview/
%exclude %{_libdir}/paraview/doc/
-
%if %{build_mpi}
%files mpi
%defattr(-,root,root,-)
%doc License_v1.2.txt
-%{_sysconfdir}/ld.so.conf.d/paraview-mpi-%{_arch}.conf
-%{_bindir}/paraview-mpi
%{_bindir}/pvbatch-mpi
%{_bindir}/pvdataserver-mpi
-%{_bindir}/pvpython-mpi
%{_bindir}/pvrenderserver-mpi
%{_bindir}/pvserver-mpi
-%{_bindir}/pvTestDriver-mpi
-%{_datadir}/applications/fedora-paraview-mpi.desktop
%{_libdir}/paraview-mpi/
%endif
@@ -388,12 +327,17 @@
%doc %{_libdir}/paraview/doc/
-%files mpi-devel
-%defattr(-,root,root,-)
-%{_includedir}/paraview-%{pv_majmin}-mpi/
-
-
%changelog
+* Mon Aug 11 2008 Orion Poplawski <orion at cora.nwra.com> - 3.3.1-0.20080811.1
+- Update 3.3.1 CVS snapshot
+- Update hdf5 patch to drop upstreamed changes
+- Fix mpi build (bug #450598)
+- Use rpath instead of ls.so conf files so mpi and non-mpi can be installed at
+ the same time
+- mpi package now just ships mpi versions of the server components
+- Drop useless mpi-devel subpackage
+- Update hdf5 patch to fix H5pubconf.h -> H5public.h usage
+
* Wed May 20 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.3.0-0.20080520.1
- Update to 3.3.0 CVS snapshot
- Update qt and gcc43 patches, drop unneeded patches
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 20 May 2008 19:28:52 -0000 1.6
+++ sources 15 Aug 2008 17:11:53 -0000 1.7
@@ -1 +1 @@
-c39e69f0b72196b7cfc725d88ae707d0 ParaView3.3.0-20080520.tar.gz
+71831b83073081d9031219c4440566cf ParaView3.3.1-20080811.tar.gz
--- paraview-3.2.1-doc.patch DELETED ---
--- paraview-3.2.1-hdf5.patch DELETED ---
--- paraview-3.2.1-rpath.patch DELETED ---
More information about the fedora-extras-commits
mailing list