Add patch to add soname to libvtkNetCDF_cxx
Conflicts: vtk.spec
This commit is contained in:
parent
05ce9d4b83
commit
ca3485d3fc
11
vtk-soname.patch
Normal file
11
vtk-soname.patch
Normal file
@ -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)
|
9
vtk.spec
9
vtk.spec
@ -12,7 +12,7 @@
|
|||||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||||
Name: vtk
|
Name: vtk
|
||||||
Version: 5.8.0
|
Version: 5.8.0
|
||||||
Release: 6%{?dist}
|
Release: 6%{?dist}.1
|
||||||
# This is a variant BSD license, a cross between BSD and ZLIB.
|
# This is a variant BSD license, a cross between BSD and ZLIB.
|
||||||
# For all intents, it has the same rights and restrictions as BSD.
|
# For all intents, it has the same rights and restrictions as BSD.
|
||||||
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
||||||
@ -20,6 +20,9 @@ License: BSD
|
|||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: http://www.vtk.org/files/release/5.8/%{name}-%{version}.tar.gz
|
Source: http://www.vtk.org/files/release/5.8/%{name}-%{version}.tar.gz
|
||||||
Patch1: vtk-5.2.0-gcc43.patch
|
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
|
# Use system libraries
|
||||||
# http://public.kitware.com/Bug/view.php?id=11823
|
# http://public.kitware.com/Bug/view.php?id=11823
|
||||||
Patch5: vtk-5.6.1-system.patch
|
Patch5: vtk-5.6.1-system.patch
|
||||||
@ -140,6 +143,7 @@ programming languages.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n VTK
|
%setup -q -n VTK
|
||||||
%patch1 -p1 -b .gcc43
|
%patch1 -p1 -b .gcc43
|
||||||
|
%patch2 -p1 -b .soname
|
||||||
%patch5 -p1 -b .system
|
%patch5 -p1 -b .system
|
||||||
|
|
||||||
# Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
|
# Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
|
||||||
@ -404,6 +408,9 @@ rm -rf %{buildroot}
|
|||||||
%doc vtk-examples/Examples
|
%doc vtk-examples/Examples
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 29 2013 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-6.1
|
||||||
|
- Add patch to add soname to libvtkNetCDF_cxx
|
||||||
|
|
||||||
* Tue May 15 2012 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 5.8.0-6
|
* Tue May 15 2012 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 5.8.0-6
|
||||||
- Add cmake28 usage when building for EL6
|
- Add cmake28 usage when building for EL6
|
||||||
- Disable -java build on PPC64 as it fails to build
|
- Disable -java build on PPC64 as it fails to build
|
||||||
|
Loading…
Reference in New Issue
Block a user