[pl/f16] Correct Java paths on ARM

[Petr Pisar]

commit 3f20f1efeb511d3491bd3edcf39b5aa74dd69b77
Author: Petr Písař <ppisar at redhat.com>
Date:   Fri Sep 23 11:42:56 2011 +0200

    Correct Java paths on ARM
    
    This approach must be superseded by JAVA_HOME=/etc/alternatives/jre
    and
    JAVA_LIB=System.out.println(System.getProperty("java.library.path")).

 pl.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/pl.spec b/pl.spec
index 457772b..56c2f95 100644
--- a/pl.spec
+++ b/pl.spec
@@ -6,7 +6,7 @@
 
 Name:       pl
 Version:    5.10.2
-Release:    5%{?dist}
+Release:    6%{?dist}
 
 Summary:    SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -189,10 +189,15 @@ export JAVA_LIB=$JAVA_HOME/jre/lib/sparc
 %ifarch sparc64
 export JAVA_LIB=$JAVA_HOME/jre/lib/sparcv9
 %else
+%ifarch %{arm}
+export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong}
+export JAVA_LIB=$JAVA_HOME/jre/lib/arm
+%else
 export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch}
 %endif
 %endif
 %endif
+%endif
 %else
 # Processed by packages/configure
 export DISABLE_PKGS="jpl"
@@ -329,6 +334,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 23 2011 Petr Pisar <ppisar at redhat.com> - 5.10.2-6
+- Correct Java paths on ARM (thanks to David A. Marlin)
+
 * Wed Aug 24 2011 Petr Pisar <ppisar at redhat.com> - 5.10.2-5
 - Fix segfault in PutImagePixels32() while displaying malformed GIF
   (bug #732952)