[paraview/f17] Add patch to buid kwProcessXML as a forwarded executable (bug #808490)
Orion Poplawski
orion at fedoraproject.org
Tue Apr 3 20:52:16 UTC 2012
commit 8a7591bb4e1cd23de42be7a11fa18385a510fc3a
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Apr 3 14:52:13 2012 -0600
Add patch to buid kwProcessXML as a forwarded executable (bug #808490)
paraview-kwprocessxml_rpath.patch | 27 +++++++++++++++++++++++++++
paraview.spec | 10 +++++++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
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 at 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 78907fc..2acfadf 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -13,7 +13,7 @@
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 3%{?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
@@ -220,6 +224,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
@@ -470,6 +475,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Tue Apr 3 2012 Orion Poplawski <orion at 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 at cora.nwra.com> - 3.14.0-3
- Only remove vtk conflicting binaries (bug #807756)
More information about the scm-commits
mailing list