Attachment 308755 Details for Bug 450607 – Patch to find the libraries and install the jar files.

[patch] Patch to find the libraries and install the jar files.

vtk-5.0.4-21.fc9.src.rpm.patch (text/plain), 2.30 KB, created by Tyson Whitehead on 2008-06-09 20:23:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tyson Whitehead

Created: 2008-06-09 20:23:31 UTC

Size: 2.30 KB

patch

obsolete

>--- vtk-5.0.4-javalibsdir.patch_	2008-05-16 10:11:50.000000000 -0400
>+++ vtk-5.0.4-javalibsdir.patch	2008-05-16 11:00:27.000000000 -0400
>@@ -0,0 +1,23 @@
>+--- VTK/Wrapping/Java/CMakeLists.txt_	2008-05-16 10:54:53.000000000 -0400
>++++ VTK/Wrapping/Java/CMakeLists.txt	2008-05-16 10:59:24.000000000 -0400
>+@@ -38,12 +38,19 @@
>+       SET(KITS ${KITS} Rendering)
>+     ENDIF(VTK_USE_RENDERING)
>+ 
>+-    # Some platforms have libjvm in a subdirectory from
>++    # Some platforms have libjvm and friends in a subdirectory from
>+     # the rest of the java libraries and are missing the symlink.
>+     IF(JAVA_AWT_LIBRARY)
>+       GET_FILENAME_COMPONENT(JAVA_LIB_DIR ${JAVA_AWT_LIBRARY} PATH)
>++      IF(EXISTS ${JAVA_LIB_DIR}/xawt)
>++        LINK_DIRECTORIES(${JAVA_LIB_DIR}/xawt)
>++      ELSEIF(EXISTS ${JAVA_LIB_DIR}/headless)
>++        LINK_DIRECTORIES(${JAVA_LIB_DIR}/headless)
>++      ENDIF(EXISTS ${JAVA_LIB_DIR}/xawt)
>+       IF(EXISTS ${JAVA_LIB_DIR}/client)
>+         LINK_DIRECTORIES(${JAVA_LIB_DIR}/client)
>++      ELSEIF(EXISTS ${JAVA_LIB_DIR}/server)
>++	LINK_DIRECTORIES(${JAVA_LIB_DIR}/server)
>+       ENDIF(EXISTS ${JAVA_LIB_DIR}/client)
>+     ENDIF(JAVA_AWT_LIBRARY)
>+     SET(CMAKE_SKIP_RPATH 0)
>--- vtk.spec_	2008-05-15 15:22:13.000000000 -0400
>+++ vtk.spec	2008-05-21 15:07:45.000000000 -0400
>@@ -13,6 +16,7 @@
> Source: http://www.vtk.org/files/release/5.0/%{name}-%{version}.tar.gz
> Patch0: vtk-5.0.0-pythondestdir.patch
> Patch1: vtk-5.0.4-gcc43.patch
>+Patch2: vtk-5.0.4-javalibsdir.patch
> URL: http://vtk.org/
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> BuildRequires: cmake >= 2.0.4
>@@ -103,6 +107,7 @@
> %setup -q -n VTK
> %patch0 -p1
> %patch1 -p1
>+%patch2 -p1
> 
> # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
> # otherwise it will break on symlinks.
>@@ -285,6 +290,13 @@
> # Add exec bits to shared libs ...
> chmod 0755 %{buildroot}%{_libdir}/vtk-5.0/CMake/*.so
> 
>+%if %{with java}
>+# Put jars in correct location ...
>+mkdir -p %{buildroot}%{_javadir}
>+install -p bin/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
>+ln -s %{buildroot}%{_javadir}/%{name}-%{version}.jar %{name}.jar
>+%endif
>+
> %check || :
> #LD_LIBARARY_PATH=`pwd`/bin ctest -V
> 
>@@ -351,6 +363,7 @@
> %{_libdir}/*Java.so.*
> %{_bindir}/vtkParseJava
> %{_bindir}/vtkWrapJava
>+%{_javadir}/%{name}*.jar
> %endif
> 
> %files qt

Actions: View | Diff

Attachments on bug 450607: 308755