rpms/paraview/F-11 import.log, NONE, 1.1 paraview-3.6.0-assistant-qt4.patch, NONE, 1.1 paraview-3.6.0-install.patch, NONE, 1.1 paraview-3.6.1-demo.patch, NONE, 1.1 paraview-3.6.1-doc.patch, NONE, 1.1 paraview-3.6.1-plugins.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 paraview.spec, 1.33, 1.34 sources, 1.9, 1.10 paraview-3.2.1-assistant-qt4.patch, 1.1, NONE paraview-3.3.0-doc.patch, 1.1, NONE paraview-3.3.0-install.patch, 1.1, NONE paraview-3.3.1-gcc43.patch, 1.1, NONE paraview-3.4.0-qt.patch, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Fri Aug 28 15:01:52 UTC 2009
- Previous message (by thread): rpms/nss-softokn/devel nss-softokn.spec,1.13,1.14
- Next message (by thread): rpms/java-augeas/devel import.log, NONE, 1.1 java-augeas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/paraview/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1471/F-11
Modified Files:
.cvsignore paraview.spec sources
Added Files:
import.log paraview-3.6.0-assistant-qt4.patch
paraview-3.6.0-install.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-doc.patch
paraview-3.3.0-install.patch paraview-3.3.1-gcc43.patch
paraview-3.4.0-qt.patch
Log Message:
-m Update to 3.6.1 from devel
--- NEW FILE import.log ---
paraview-3_6_1-5_fc12:F-11:paraview-3.6.1-5.fc12.src.rpm:1251471554
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_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 = "\\";
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-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 "${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/F-11/.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 28 Aug 2009 15:01:51 -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/F-11/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 28 Aug 2009 15:01:52 -0000 1.34
@@ -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: 4%{?dist}
+Release: 5%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -15,18 +15,24 @@ 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
#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.3.0-doc.patch
-Patch4: paraview-3.2.1-assistant-qt4.patch
+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
-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
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -43,6 +49,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 +58,57 @@ Requires(postun): /usr/bin/update-deskto
Obsoletes: paraview-demos < %{version}-%{release}
Provides: paraview-demos = %{version}-%{release}
+#VTK_USE_RPATH=OFF needed to build everything
+# This is still an alpha feature and does not install properly -
+# libOverViewCora.so is not installed
+# -DPARAVIEW_BUILD_OverView:BOOL=ON
+# These require OverView
+# -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_ClientGraphViewFrame:BOOL=ON
+# -DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=ON \\\
+# -DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=ON \\\
+# -DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=ON
+# -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=ON \\\
+# -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=ON \\\
+# -DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=ON \\\
+# -DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=ON \\\
+# -DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=ON \\\
+# -DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=ON
+%define paraview_cmake_options \\\
+ -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
+ -DCMAKE_C_COMPILER:FILEPATH=$CC \\\
+ -DTCL_LIBRARY:PATH=tcl \\\
+ -DTK_LIBRARY:PATH=tk \\\
+ -DPARAVIEW_BUILD_StreamingParaView:BOOL=ON \\\
+ -DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\
+ -DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\
+ -DPARAVIEW_BUILD_PLUGIN_CosmoFilters: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_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
@@ -67,7 +125,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}
@@ -120,12 +179,12 @@ BuildArch: noarch
%prep
-%setup -q -n ParaView-%{version}
-%patch1 -p1 -b .qt
+%setup -q -n ParaView3
%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
@@ -141,27 +200,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
+ -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
+ %{paraview_cmake_options}
+##Need to run cmake twice to get MPI headers into VTK/Parallel build config
cmake ..
make VERBOSE=1 %{?_smp_mflags}
popd
@@ -173,28 +215,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 \
+ -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview-mpi \
-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}
@@ -220,12 +246,13 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{
pushd fedora-mpi
make install DESTDIR=$RPM_BUILD_ROOT
+#Don't ship copy of Qt assisstant
+rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
+ $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/assistant-real
#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
+rm -f lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
#Move the remaining mpi binaries out of the way
for f in *
do
@@ -236,7 +263,7 @@ 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
%endif
@@ -270,11 +297,12 @@ popd
rm -r $RPM_BUILD_ROOT/usr/plugins
#Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_bindir}/assistant
+rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
+ $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
#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/
%clean
@@ -301,8 +329,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
@@ -311,6 +341,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
@@ -327,7 +359,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
@@ -341,10 +372,30 @@ 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
+* Thu Aug 27 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-5
+- Specify PV_INSTALL_LIB_DIR as relative path, drop install prefix patch
+- Update assitant patch to use assistant_adp, don't ship assistant-real
+
+* Wed Aug 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
+- Disable building various plugins that need OverView
+
+* Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-3
+- Disable building OverView - not ready yet
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.6.1-2
+- rebuilt with new openssl
+
+* 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)
+
* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-11/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 28 Aug 2009 15:01:52 -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-doc.patch DELETED ---
--- paraview-3.3.0-install.patch DELETED ---
--- paraview-3.3.1-gcc43.patch DELETED ---
--- paraview-3.4.0-qt.patch DELETED ---
- Previous message (by thread): rpms/nss-softokn/devel nss-softokn.spec,1.13,1.14
- Next message (by thread): rpms/java-augeas/devel import.log, NONE, 1.1 java-augeas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list