[paraview] Drop kwProcessXML patch, leave as vtkkwProcessXML with rpath

Orion Poplawski orion at fedoraproject.org
Mon Jan 28 23:29:30 UTC 2013 

commit 27b8c85d11aac398b68440bf5a43952e5bc99934
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Jan 28 16:29:07 2013 -0700

    Drop kwProcessXML patch, leave as vtkkwProcessXML with rpath

 paraview-kwprocessxml_rpath.patch |   27 -------------------------
 paraview.spec                     |   15 ++++---------
 vtk-6.0.0-netcdf.patch            |   40 ++++++++++++++++++------------------
 3 files changed, 25 insertions(+), 57 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index 69219e3..1b6d4e9 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -13,7 +13,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -31,10 +31,6 @@ Patch1:         vtk-6.0.0-system.patch
 Patch2:         paraview-Protobuf.patch
 #Patch to vtk to use system netcdf library
 Patch3:         vtk-6.0.0-netcdf.patch
-#Build kwProcessXML as forwarded executable
-#https://bugzilla.redhat.com/show_bug.cgi?id=808490
-#http://paraview.org/Bug/view.php?id=13054
-Patch4:         paraview-kwprocessxml_rpath.patch
 # Upstream patch to fix pvblot build
 # http://www.paraview.org/Bug/view.php?id=13654
 Patch5:         paraview-pvblot.patch
@@ -228,7 +224,6 @@ developing applications that use %{name}-mpich2.
 %patch1 -p0 -b .system
 %patch2 -p1 -b .Protobuf
 %patch3 -p0 -b .netcdf
-%patch4 -p1 -b .kwprocessxml_rpath
 %patch5 -p1 -b .pvblot
 #Remove included thirdparty sources just to be sure
 for x in protobuf
@@ -392,9 +387,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/vtkPV*Python.so
 
 #Cleanup only vtk conflicting binaries
 rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,HashSource,Parse{Java,OGLExt},ProcessShader,Wrap{Hierarchy,Java,Python,Tcl,TclInit,PythonInit}}
-# Special case until we get this right
-rm $RPM_BUILD_ROOT%{_bindir}/vtkkwProcessXML
-mv $RPM_BUILD_ROOT%{_libdir}/paraview/vtkkwProcessXML $RPM_BUILD_ROOT%{_libdir}/paraview/kwProcessXML
 popd
 
 
@@ -445,7 +437,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/mime/packages/paraview.xml
 
 %files devel
-%{_bindir}/kwProcessXML
+%{_bindir}/vtkkwProcessXML
 %{_bindir}/vtkWrapClientServer
 %{_includedir}/paraview/
 %{_datadir}/cmake/
@@ -485,6 +477,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Jan 28 2013 Orion Poplawski <orion at cora.nwra.com> - 3.98.0-3
+- Drop kwProcessXML patch, leave as vtkkwProcessXML with rpath
+
 * Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 3.98.0-2
 - rebuild due to "jpeg8-ABI" feature drop
 
diff --git a/vtk-6.0.0-netcdf.patch b/vtk-6.0.0-netcdf.patch
index d6e132f..df0ef94 100644
--- a/vtk-6.0.0-netcdf.patch
+++ b/vtk-6.0.0-netcdf.patch
@@ -1,6 +1,6 @@
-diff -up VTK/IO/NetCDF/CMakeLists.txt.system VTK/IO/NetCDF/CMakeLists.txt
---- VTK/IO/NetCDF/CMakeLists.txt.system	2012-12-03 08:31:35.000000000 -0700
-+++ VTK/IO/NetCDF/CMakeLists.txt	2012-12-06 10:04:07.601857782 -0700
+diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt
+--- VTK/IO/NetCDF/CMakeLists.txt.netcdf	2013-01-28 14:44:35.000000000 -0700
++++ VTK/IO/NetCDF/CMakeLists.txt	2013-01-28 15:40:00.825176295 -0700
 @@ -10,5 +10,5 @@ set(Module_SRCS
  
  vtk_module_library(vtkIONetCDF ${Module_SRCS})
@@ -8,18 +8,18 @@ diff -up VTK/IO/NetCDF/CMakeLists.txt.system VTK/IO/NetCDF/CMakeLists.txt
 -target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
 +target_link_libraries(vtkIONetCDF netcdf_c++ netcdf)
  set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
-diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.system VTK/IO/ParallelNetCDF/CMakeLists.txt
---- VTK/IO/ParallelNetCDF/CMakeLists.txt.system	2012-12-03 08:31:35.000000000 -0700
-+++ VTK/IO/ParallelNetCDF/CMakeLists.txt	2012-12-06 10:03:01.691191800 -0700
+diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt
+--- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf	2013-01-28 14:44:35.000000000 -0700
++++ VTK/IO/ParallelNetCDF/CMakeLists.txt	2013-01-28 15:40:00.825176295 -0700
 @@ -8,4 +8,4 @@ set(Module_SRCS
  
  vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
  
 -target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
 +target_link_libraries(vtkIOParallelNetCDF netcdf)
-diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.system VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
---- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.system	2012-12-03 08:31:37.000000000 -0700
-+++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt	2012-12-06 10:04:38.784720013 -0700
+diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+--- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf	2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt	2013-01-28 15:40:27.534030910 -0700
 @@ -241,7 +241,7 @@ ENDIF(APPLE)
  
  
@@ -27,11 +27,11 @@ diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.system VTK/ThirdPart
 -TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
 +TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
  
- IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
- #  INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h
-diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.system VTK/ThirdParty/netcdf/CMakeLists.txt
---- VTK/ThirdParty/netcdf/CMakeLists.txt.system	2012-12-03 08:31:39.000000000 -0700
-+++ VTK/ThirdParty/netcdf/CMakeLists.txt	2012-12-06 09:58:22.810749439 -0700
+ #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+ 
+diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt
+--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf	2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/netcdf/CMakeLists.txt	2013-01-28 15:40:00.825176295 -0700
 @@ -1,8 +1,12 @@
  set(vtknetcdf_THIRD_PARTY 1)
 -set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
@@ -51,9 +51,9 @@ diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.system VTK/ThirdParty/netcdf/CMake
 +endif()
  vtk_module_export_info()
 -add_subdirectory(vtknetcdf)
-diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.system VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
---- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.system	2012-12-03 08:31:39.000000000 -0700
-+++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h	2012-12-06 09:58:22.810749439 -0700
+diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
+--- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf	2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h	2013-01-28 15:40:00.826176289 -0700
 @@ -16,6 +16,6 @@
  #define __vtk_netcdfcpp_h
  
@@ -62,9 +62,9 @@ diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.system VTK/ThirdParty/netcdf/vtk_
 +#include <netcdfcpp.h>
  
  #endif
-diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.system VTK/ThirdParty/netcdf/vtk_netcdf.h
---- VTK/ThirdParty/netcdf/vtk_netcdf.h.system	2012-12-03 08:31:39.000000000 -0700
-+++ VTK/ThirdParty/netcdf/vtk_netcdf.h	2012-12-06 09:58:22.810749439 -0700
+diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h
+--- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf	2013-01-28 14:44:36.000000000 -0700
++++ VTK/ThirdParty/netcdf/vtk_netcdf.h	2013-01-28 15:40:00.826176289 -0700
 @@ -16,6 +16,6 @@
  #define __vtk_netcdf_h

More information about the scm-commits mailing list