rpms/paraview/devel paraview-3.4.0-doc.patch, NONE, 1.1 paraview.spec, 1.33, 1.34 paraview-3.3.0-doc.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

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

Modified Files:
	paraview.spec 
Added Files:
	paraview-3.4.0-doc.patch 
Removed Files:
	paraview-3.3.0-doc.patch 
Log Message:
* 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)


paraview-3.4.0-doc.patch:

--- NEW FILE paraview-3.4.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.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;


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- paraview.spec	24 Feb 2009 22:42:21 -0000	1.33
+++ paraview.spec	8 May 2009 14:33:28 -0000	1.34
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -20,7 +20,7 @@ Patch1:         paraview-3.4.0-qt.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
+Patch3:         paraview-3.4.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.1-gcc43.patch
@@ -67,7 +67,8 @@ various Unix workstations and clusters. 
 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 NOT been compiled with MPI support.
+NOTE: The version in this package has NOT been compiled with MPI support.
+Install the paraview-mpi package to get MPI support.
 
 
 %if %{build_mpi}
@@ -345,6 +346,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* 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)
+
 * Tue Feb 24 2009 Orion Poplawski <orion at cora.nwra.com> - 3.4.0-4
 - Rebuild with hdf5 1.8.2, gcc 4.4.0
 - Update hdf5-1.8 patch to work with hdf5 1.8.2


--- paraview-3.3.0-doc.patch DELETED ---