rpms/paraview/F-13 import.log, NONE, 1.1 paraview-3.8.0-demo.patch, NONE, 1.1 paraview-3.8.0-hdf5-1.8.patch, NONE, 1.1 paraview-3.8.0-include.patch, NONE, 1.1 paraview-3.8.0-installpath.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 paraview.spec, 1.49, 1.50 sources, 1.11, 1.12 paraview-3.4.0-hdf5-1.8.2.patch, 1.1, NONE paraview-3.6.0-assistant-qt4.patch, 1.2, NONE paraview-3.6.0-install.patch, 1.1, NONE paraview-3.6.1-demo.patch, 1.1, NONE paraview-3.6.1-doc.patch, 1.1, NONE paraview-3.6.1-plugins.patch, 1.2, NONE
Orion Poplawski
orion at fedoraproject.org
Thu Jun 3 19:46:00 UTC 2010
Author: orion
Update of /cvs/pkgs/rpms/paraview/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28546/F-13
Modified Files:
.cvsignore paraview.spec sources
Added Files:
import.log paraview-3.8.0-demo.patch
paraview-3.8.0-hdf5-1.8.patch paraview-3.8.0-include.patch
paraview-3.8.0-installpath.patch
Removed Files:
paraview-3.4.0-hdf5-1.8.2.patch
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
Log Message:
-m Update to 3.8.0 from devel
--- NEW FILE import.log ---
paraview-3_8_0-1_fc14:F-13:paraview-3.8.0-1.fc14.src.rpm:1275594338
paraview-3.8.0-demo.patch:
CMakeLists.txt | 4 ----
1 file changed, 4 deletions(-)
--- NEW FILE paraview-3.8.0-demo.patch ---
--- ParaView-3.8.0/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt.demo 2010-05-27 11:04:39.000000000 -0600
+++ ParaView-3.8.0/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2010-06-02 09:45:44.105517239 -0600
@@ -4,7 +4,3 @@
add_executable(${exe} PointSpriteDemo.cxx)
target_link_libraries(${exe} PointSprite_Rendering vtkIO)
-
-install(TARGETS ${exe}
- RUNTIME DESTINATION ${PROJECT_BINARY_DIR}
-)
paraview-3.8.0-hdf5-1.8.patch:
XdmfDataDesc.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE paraview-3.8.0-hdf5-1.8.patch ---
--- ParaView-3.8.0-RC1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.hdf5-1.8 2010-03-18 09:24:25.000000000 -0600
+++ ParaView-3.8.0-RC1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2010-04-20 13:27:30.966346738 -0600
@@ -729,7 +729,7 @@
status = H5Tinsert( this->DataType,
Name,
Offset,
-#if (!H5_USE_16_API_DEFAULT && ((H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))))
+#if (!H5_USE_16_API && ((H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))))
H5Tarray_create( HNumberType, rank, Dims));
#else
H5Tarray_create( HNumberType, rank, Dims, NULL ));
paraview-3.8.0-include.patch:
XdmfDataDesc.h | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE paraview-3.8.0-include.patch ---
--- ParaView-3.8.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.h.include 2009-11-27 02:56:17.000000000 -0700
+++ ParaView-3.8.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2010-04-19 13:59:05.609711395 -0600
@@ -27,6 +27,7 @@
#include "XdmfObject.h"
#include "XdmfHDFSupport.h"
+#include <cstring>
#define XDMF_SELECTALL 0
#define XDMF_HYPERSLAB 1
paraview-3.8.0-installpath.patch:
AdaptiveParaView/CMakeLists.txt | 2 ++
ParaView/CMakeLists.txt | 2 ++
StreamingParaView/CMakeLists.txt | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE paraview-3.8.0-installpath.patch ---
>From 07ba5364f3ab16d33e7ae7c67f64c4b25e2de11f Mon Sep 17 00:00:00 2001
From: Utkarsh Ayachit <utkarsh.ayachit at kitware.com>
Date: Thu, 3 Jun 2010 09:49:23 -0400
Subject: [PATCH] Paraview clients were ignoring set install path.
The ParaView custom clients were not passing the PV_INSTALL_LIB_DIR to the
build_paraview_client macro. As a consequence it was doing the default thing.
Fixed that.
---
Applications/AdaptiveParaView/CMakeLists.txt | 2 ++
Applications/ParaView/CMakeLists.txt | 2 ++
Applications/StreamingParaView/CMakeLists.txt | 2 ++
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/Applications/AdaptiveParaView/CMakeLists.txt b/Applications/AdaptiveParaView/CMakeLists.txt
index f93cd01..a951229 100644
--- a/Applications/AdaptiveParaView/CMakeLists.txt
+++ b/Applications/AdaptiveParaView/CMakeLists.txt
@@ -45,6 +45,8 @@ build_paraview_client(adaptive_paraview
${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomFilters.xml
${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomSources.xml
SOURCES ${Application_SOURCE_FILES}
+ INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}"
+ INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}"
)
ADD_EXECUTABLE(ppRawStridedReader2 ppRawStridedReader2.cxx)
diff --git a/Applications/ParaView/CMakeLists.txt b/Applications/ParaView/CMakeLists.txt
index 6ec9d99..75de3ed 100644
--- a/Applications/ParaView/CMakeLists.txt
+++ b/Applications/ParaView/CMakeLists.txt
@@ -63,6 +63,8 @@ build_paraview_client(paraview
${PARAVIEW_EXTRA_GUI_RESOURCES} # Add any compiled in GUI configuration xmls
COMPRESSED_HELP_FILE "${ParaView_BINARY_DIR}/Documentation/paraview.qch"
SOURCES ${ParaView_SOURCE_FILES}
+ INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}"
+ INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}"
)
# Configure the ".plugins" configuration xml for making paraview aware of the
diff --git a/Applications/StreamingParaView/CMakeLists.txt b/Applications/StreamingParaView/CMakeLists.txt
index e113172..c39f768 100644
--- a/Applications/StreamingParaView/CMakeLists.txt
+++ b/Applications/StreamingParaView/CMakeLists.txt
@@ -45,6 +45,8 @@ build_paraview_client(streaming_paraview
${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomFilters.xml
${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomSources.xml
SOURCES ${Application_SOURCE_FILES}
+ INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}"
+ INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}"
)
IF(FALSE)#BUILD_TESTING)
--
1.7.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-13/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore 4 Jan 2010 18:36:31 -0000 1.11
+++ .cvsignore 3 Jun 2010 19:45:58 -0000 1.12
@@ -1 +1 @@
-paraview-3.6.2.tar.gz
+ParaView-3.8.0.tar.gz
Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-13/paraview.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- paraview.spec 19 Feb 2010 15:31:27 -0000 1.49
+++ paraview.spec 3 Jun 2010 19:46:00 -0000 1.50
@@ -1,41 +1,37 @@
%{!?build_openmpi:%global build_openmpi 1}
%{!?build_mpich2:%global build_mpich2 1}
%define pv_maj 3
-%define pv_min 6
-%define pv_patch 2
+%define pv_min 8
+%define pv_patch 0
%define pv_majmin %{pv_maj}.%{pv_min}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 3%{?dist}
+Release: 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
Source1: paraview_22x22.png
Source2: paraview.xml
#Add needed link libraries
#http://public.kitware.com/Bug/view.php?id=10298
Patch0: paraview-3.6.2-libs.patch
-#Don't try to copy Qt libraries into paraview directory
-Patch2: paraview-3.6.0-install.patch
-#Move pqClient.adp into %{_datadir}/paraview
-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
+#Add some needed includes
+Patch1: paraview-3.8.0-include.patch
+#Upstream patch to fix install paths
+Patch2: paraview-3.8.0-installpath.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
+Patch5: paraview-3.8.0-demo.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
+#Change H5_USE_16_API_DEFAULT to H5_USE_16_API
+Patch8: paraview-3.8.0-hdf5-1.8.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,9 +53,9 @@ BuildRequires: openssl-devel
BuildRequires: gnuplot
BuildRequires: wget
BuildRequires: boost-devel
+BuildRequires: qt-assistant-adp-devel
Requires: %{name}-data = %{version}-%{release}
Requires: %{name}-doc = %{version}-%{release}
-Requires: qt4-assistant
Requires(post): /usr/bin/update-desktop-database
Requires(postun): /usr/bin/update-desktop-database
Obsoletes: paraview-demos < %{version}-%{release}
@@ -208,15 +204,13 @@ BuildArch: noarch
%prep
-%setup -q -n ParaView3
+%setup -q -n ParaView-%{version}
%patch0 -p1 -b .libs
-%patch2 -p1 -b .install
-%patch3 -p1 -b .doc
-%patch4 -p1 -b .assistant-qt4
+%patch1 -p1 -b .include
+%patch2 -p1 -b .installpath
%patch5 -p1 -b .demo
-%patch6 -p1 -b .plugins
%patch7 -p1 -b .hdf5
-%patch8 -p1 -b .hdf5-1.8.2
+%patch8 -p1 -b .hdf5-1.8
#Remove included hdf5 just to be sure
rm -r Utilities/hdf5
@@ -301,15 +295,12 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{
pushd fedora-openmpi
make install DESTDIR=$RPM_BUILD_ROOT
-#Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_libdir}/openmpi/bin/assistant \
- $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/assistant-real
#Cleanup %{_bindir}
pushd $RPM_BUILD_ROOT/%{_libdir}/openmpi/bin
#Don't need mpi versions of these
-rm lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
+rm paraview streaming_paraview lproj pvblot pvpython
#Move the remaining mpi binaries out of the way
-for f in pvbatch pvdataserver pvrenderserver pvserver
+for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver
do
mv $f ${f}_openmpi
done
@@ -326,15 +317,12 @@ popd
pushd fedora-mpich2
make install DESTDIR=$RPM_BUILD_ROOT
-#Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_libdir}/mpich2/bin/assistant \
- $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/assistant-real
#Cleanup %{_bindir}
pushd $RPM_BUILD_ROOT/%{_libdir}/mpich2/bin
#Don't need mpi versions of these
-rm lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
+rm paraview streaming_paraview lproj pvblot pvpython
#Move the remaining mpi binaries out of the way
-for f in pvbatch pvdataserver pvrenderserver pvserver
+for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver
do
mv $f ${f}_mpich2
done
@@ -375,16 +363,9 @@ popd
#Don't ship the VTK Qt Designer plugin
rm -r $RPM_BUILD_ROOT/usr/plugins
-#Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_bindir}/assistant \
- $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
#Don't ship lproj - provided by vtk
rm $RPM_BUILD_ROOT%{_bindir}/lproj
-#Move the documentation
-#mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \
-# $RPM_BUILD_ROOT%{_datadir}/paraview/
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -417,12 +398,13 @@ update-mime-database %{_datadir}/mime &>
%{_bindir}/pvpython
%{_bindir}/pvrenderserver
%{_bindir}/pvserver
-%{_bindir}/pvTestDriver
-%{_bindir}/vtkSMExtractDocumentation
+%{_bindir}/smTestDriver
+%{_bindir}/streaming_paraview
%{_libdir}/paraview/
%exclude %{_libdir}/paraview/doc/
+%{python_sitelib}/Xdmf/
%dir %{_datadir}/paraview
-%doc %{_datadir}/paraview/about.html
+
%if %{build_mpich2}
%files openmpi
@@ -432,6 +414,7 @@ update-mime-database %{_datadir}/mime &>
%{_libdir}/openmpi/bin/pvdataserver_openmpi
%{_libdir}/openmpi/bin/pvrenderserver_openmpi
%{_libdir}/openmpi/bin/pvserver_openmpi
+%{_libdir}/openmpi/bin/smTestDriver_openmpi
%{_libdir}/openmpi/lib/paraview
%endif
@@ -444,6 +427,7 @@ update-mime-database %{_datadir}/mime &>
%{_libdir}/mpich2/bin/pvdataserver_mpich2
%{_libdir}/mpich2/bin/pvrenderserver_mpich2
%{_libdir}/mpich2/bin/pvserver_mpich2
+%{_libdir}/mpich2/bin/smTestDriver_mpich2
%{_libdir}/mpich2/lib/paraview
%endif
@@ -463,12 +447,25 @@ update-mime-database %{_datadir}/mime &>
%files doc
%defattr(-,root,root,-)
-%doc %{_datadir}/paraview/pqClient.adp
-%doc %{_datadir}/paraview/pqClientDocFinder.txt
-%doc %{_datadir}/paraview/Documentation/
+#doc %{_datadir}/paraview/pqClient.adp
+#doc %{_datadir}/paraview/pqClientDocFinder.txt
+#doc %{_datadir}/paraview/Documentation/
%changelog
+* Tue Jun 1 2010 Orion Poplawski <orion at cora.nwra.com> - 3.8.0-1
+- Update to 3.8.0
+- Update demo patch
+- Update hdf5 patch
+- Drop old documentation patches
+- Add patch to add needed include headers
+- Add patch from upstream to fix install path issue
+
+* Sat Mar 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.6.2-4
+- BR qt-assistant-adp-devel
+- Don't Require qt4-assistant, should be qt-assistant-adp now, and it (or qt-x11
+ 4.6.x which Provides it) gets dragged in anyway by the soname dependencies
+
* Fri Feb 19 2010 Orion Poplawski <orion at cora.nwra.com> - 3.6.2-3
- More MPI packaging changes
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-13/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources 4 Jan 2010 18:36:31 -0000 1.11
+++ sources 3 Jun 2010 19:46:00 -0000 1.12
@@ -1 +1 @@
-1c004eb82e291452efb45527745a78e4 paraview-3.6.2.tar.gz
+4f371631c373452b202a3d91f2cca12f ParaView-3.8.0.tar.gz
--- paraview-3.4.0-hdf5-1.8.2.patch DELETED ---
--- paraview-3.6.0-assistant-qt4.patch DELETED ---
--- paraview-3.6.0-install.patch DELETED ---
--- paraview-3.6.1-demo.patch DELETED ---
--- paraview-3.6.1-doc.patch DELETED ---
--- paraview-3.6.1-plugins.patch DELETED ---
More information about the scm-commits
mailing list