From ca3485d3fc57c1c3f366b1ec191e955802cc17e3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 24 May 2012 11:52:03 -0600 Subject: [PATCH] Add patch to add soname to libvtkNetCDF_cxx Conflicts: vtk.spec --- vtk-soname.patch | 11 +++++++++++ vtk.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 vtk-soname.patch diff --git a/vtk-soname.patch b/vtk-soname.patch new file mode 100644 index 0000000..2f413fb --- /dev/null +++ b/vtk-soname.patch @@ -0,0 +1,11 @@ +diff -up VTK/Utilities/vtknetcdf/CMakeLists.txt.soname VTK/Utilities/vtknetcdf/CMakeLists.txt +--- VTK/Utilities/vtknetcdf/CMakeLists.txt.soname 2011-08-24 07:37:14.000000000 -0600 ++++ VTK/Utilities/vtknetcdf/CMakeLists.txt 2013-01-29 08:53:23.576422893 -0700 +@@ -298,6 +298,7 @@ ADD_DEFINITIONS("-DNC_DLL_EXPORT") + # Apply user-defined properties to the library target. + IF(VTK_LIBRARY_PROPERTIES) + SET_TARGET_PROPERTIES(vtkNetCDF PROPERTIES ${VTK_LIBRARY_PROPERTIES}) ++ SET_TARGET_PROPERTIES(vtkNetCDF_cxx PROPERTIES ${VTK_LIBRARY_PROPERTIES}) + ENDIF(VTK_LIBRARY_PROPERTIES) + + IF(NOT VTK_INSTALL_NO_LIBRARIES) diff --git a/vtk.spec b/vtk.spec index e6a7c2e..bc5ea69 100644 --- a/vtk.spec +++ b/vtk.spec @@ -12,7 +12,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 5.8.0 -Release: 6%{?dist} +Release: 6%{?dist}.1 # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -20,6 +20,9 @@ License: BSD Group: System Environment/Libraries Source: http://www.vtk.org/files/release/5.8/%{name}-%{version}.tar.gz Patch1: vtk-5.2.0-gcc43.patch +# Add soname to libvtkNetCDF_cxx +# http://vtk.org/Bug/view.php?id=12207 +Patch2: vtk-soname.patch # Use system libraries # http://public.kitware.com/Bug/view.php?id=11823 Patch5: vtk-5.6.1-system.patch @@ -140,6 +143,7 @@ programming languages. %prep %setup -q -n VTK %patch1 -p1 -b .gcc43 +%patch2 -p1 -b .soname %patch5 -p1 -b .system # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} @@ -404,6 +408,9 @@ rm -rf %{buildroot} %doc vtk-examples/Examples %changelog +* Tue Jan 29 2013 Orion Poplawski - 5.8.0-6.1 +- Add patch to add soname to libvtkNetCDF_cxx + * Tue May 15 2012 Jonathan G. Underwood - 5.8.0-6 - Add cmake28 usage when building for EL6 - Disable -java build on PPC64 as it fails to build