[pl] Correct Java paths on ARM

Petr Pisar ppisar at fedoraproject.org
Fri Sep 23 09:45:28 UTC 2011


commit f9276e466f7d2124e9a6ef94dca6aef1abf509cb
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 d355a5e..6323418 100644
--- a/pl.spec
+++ b/pl.spec
@@ -6,7 +6,7 @@
 
 Name:       pl
 Version:    5.10.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 
 Summary:    SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -175,10 +175,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"
@@ -315,6 +320,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 23 2011 Petr Pisar <ppisar at redhat.com> - 5.10.5-3
+- Correct Java paths on ARM (thanks to David A. Marlin)
+
 * Wed Aug 24 2011 Petr Pisar <ppisar at redhat.com> - 5.10.5-2
 - Fix segfault in PutImagePixels32() while displaying malformed GIF
   (bug #732952)


More information about the scm-commits mailing list