From a9d90b7fa23247b7fdd62de824036d39c3fd01cc Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Apr 03 2012 20:53:13 +0000
Subject: Merge branch 'f17'


---

diff --git a/paraview-kwprocessxml_rpath.patch b/paraview-kwprocessxml_rpath.patch
new file mode 100644
index 0000000..f71ead9
--- /dev/null
+++ b/paraview-kwprocessxml_rpath.patch
@@ -0,0 +1,27 @@
+Description: This patch forces building of kwProcessXML as shared forwarded 
+ executable in our case (even is CMAKE_SKIP_RPATH is OFF in debian)
+Author: Mathieu Malaterre <mathieu.malaterre@gmail.com>
+Bug-Debian: http://bugs.debian.org/640305
+Last-Update: 2011-09-13
+
+--- a/Common/KWCommon/CMakeLists.txt
++++ b/Common/KWCommon/CMakeLists.txt
+@@ -225,7 +225,7 @@
+ IF(KWCOMMON_BUILD_PROCESSXML)
+   # For shared libraries on non-windows systems use the KWSys shared-forward
+   # implementation to make sure shared libraries are found.
+-  IF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
++  IF(BUILD_SHARED_LIBS )
+     IF(NOT WIN32)
+       SET(KWCommon_FORWARD_DIR_BUILD ${EXECUTABLE_OUTPUT_PATH})
+       SET(KWCommon_FORWARD_BIN_TO_LIB "..${KWCommon_INSTALL_LIB_DIR}")
+@@ -248,7 +248,7 @@
+           COMPONENT Development)
+       ENDIF(NOT KWCommon_INSTALL_NO_DEVELOPMENT)
+     ENDIF(NOT WIN32)
+-  ENDIF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
++  ENDIF(BUILD_SHARED_LIBS )
+ 
+   ADD_EXECUTABLE(kwProcessXML${KWCommon_EXE_SUFFIX} ProcessXML.cxx)
+   TARGET_LINK_LIBRARIES(kwProcessXML${KWCommon_EXE_SUFFIX} vtkCommon vtksys)
+
diff --git a/paraview.spec b/paraview.spec
index 16b6407..e810700 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -13,7 +13,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -29,6 +29,10 @@ Patch2:         vtk-5.6.1-system.patch
 #Patch to build with gcc 4.7
 #Reported upstream: http://paraview.org/Bug/view.php?id=12881
 Patch3:         paraview-gcc47.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
 #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
 Patch7:         paraview-3.2.2-hdf5.patch
 
@@ -221,6 +225,7 @@ developing applications that use %{name}-mpich2.
 %patch1 -p1 -b .include
 %patch2 -p0 -b .system
 %patch3 -p1 -b .gcc47
+%patch4 -p1 -b .kwprocessxml_rpath
 %patch7 -p1 -b .hdf5
 #Remove included hdf5 just to be sure
 rm -r VTK/Utilities/vtkhdf5
@@ -381,8 +386,8 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/Python
 mv $RPM_BUILD_ROOT%{_libdir}/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/
 mv $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/
 
-#Cleanup vtk binaries
-rm $RPM_BUILD_ROOT%{_bindir}/vtk*
+#Cleanup vtk conflicting binaries
+rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,WrapPython,WrapPythonInit}
 popd
 
 
@@ -434,6 +439,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %files devel
 %{_bindir}/kwProcessXML
+%{_bindir}/vtkWrapClientServer
+%{_bindir}/vtkWrapHierarchy
 %{_includedir}/paraview/
 %{_datadir}/doc/paraview-%{pv_majmin}/
 
@@ -469,6 +476,12 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Apr 3 2012 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-4
+- Add patch to buid kwProcessXML as a forwarded executable (bug #808490)
+
+* Thu Mar 29 2012 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-3
+- Only remove vtk conflicting binaries (bug #807756)
+
 * Wed Feb 29 2012 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-2
 - Add patch to make vtk use system libraries