Thu Jul 23 19:29:42 UTC 2009

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22033

Modified Files:
	.cvsignore paraview.spec sources 
Added Files:
	paraview-3.6.0-assistant-qt4.patch 
	paraview-3.6.0-install.patch 
	paraview-3.6.1-cmake-install-prefix.patch 
	paraview-3.6.1-demo.patch paraview-3.6.1-doc.patch 
	paraview-3.6.1-plugins.patch 
Removed Files:
	paraview-3.2.1-assistant-qt4.patch 
	paraview-3.3.0-install.patch paraview-3.3.1-gcc43.patch 
	paraview-3.4.0-doc.patch paraview-3.4.0-qt.patch 
Log Message:
* Wed Jul 22 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-1
- Update to 3.6.1


paraview-3.6.0-assistant-qt4.patch:
 Applications/OverView/Core/MainWindow.cxx |    2 +-
 Qt/Components/pqClientMainWindow.cxx      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE paraview-3.6.0-assistant-qt4.patch ---
--- 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 = "\\";

paraview-3.6.0-install.patch:
 CMakeLists.txt |    9 ---------
 1 file changed, 9 deletions(-)

--- NEW FILE paraview-3.6.0-install.patch ---
--- 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)

paraview-3.6.1-cmake-install-prefix.patch:
 CMake/ParaViewCommon.cmake                 |    2 +-
 Plugins/pvblot/CMakeLists.txt              |    2 +-
 Servers/ServerManager/CMakeLists.txt       |    5 +++--
 Utilities/IceT/CMakeLists.txt              |    6 +++---
 Utilities/VTKPythonWrapping/CMakeLists.txt |    2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

--- NEW FILE paraview-3.6.1-cmake-install-prefix.patch ---
--- 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(<build_file>)
 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}")

paraview-3.6.1-demo.patch:
 CMakeLists.txt |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE paraview-3.6.1-demo.patch ---
--- 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}
-)

paraview-3.6.1-doc.patch:
 Applications/Client/CMakeLists.txt        |    2 +-
 Applications/OverView/Core/MainWindow.cxx |    2 +-
 Documentation/CMakeLists.txt              |    6 +++---
 Qt/Components/pqClientMainWindow.cxx      |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE paraview-3.6.1-doc.patch ---
--- 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");*/

paraview-3.6.1-plugins.patch:
 ParaViewPlugins.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE paraview-3.6.1-plugins.patch ---
--- 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)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Oct 2008 17:09:48 -0000	1.9
+++ .cvsignore	23 Jul 2009 19:29:42 -0000	1.10
@@ -1 +1 @@
-paraview-3.4.0.tar.gz
+paraview-3.6.1.tar.gz


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- paraview.spec	8 May 2009 14:33:28 -0000	1.34
+++ paraview.spec	23 Jul 2009 19:29:42 -0000	1.35
@@ -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-deskto
 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 &>
 %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 &>
 %{_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 &>
 %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 &>
 %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 <orion at cora.nwra.com> - 3.6.1-1
+- Update to 3.6.1
+
 * Thu May 7 2009 Orion Poplawski <orion at cora.nwra.com> - 3.4.0-5
 - Update doc patch to look for help file in the right place (bug #499273)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Oct 2008 17:09:48 -0000	1.9
+++ sources	23 Jul 2009 19:29:42 -0000	1.10
@@ -1 +1 @@
-a12067913e08ea7a465ca41509dbfde1  paraview-3.4.0.tar.gz
+becbff0b9989b1b788dba75c4289ee7e  paraview-3.6.1.tar.gz


--- paraview-3.2.1-assistant-qt4.patch DELETED ---


--- paraview-3.3.0-install.patch DELETED ---


--- paraview-3.3.1-gcc43.patch DELETED ---


--- paraview-3.4.0-doc.patch DELETED ---


--- paraview-3.4.0-qt.patch DELETED ---


