rpms/pl/F-10 pl.spec,1.53,1.54

Dennis Gilmore ausil at fedoraproject.org
Mon Mar 2 14:33:55 UTC 2009


Author: ausil

Update of /cvs/pkgs/rpms/pl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24843

Modified Files:
	pl.spec 
Log Message:
fix JAVA_HOME and JAVA_LIB for sparc arches



Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-10/pl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- pl.spec	25 Feb 2009 12:10:13 -0000	1.53
+++ pl.spec	2 Mar 2009 14:33:24 -0000	1.54
@@ -3,7 +3,7 @@
 
 Name:		pl
 Version:	5.6.60
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -124,8 +124,17 @@
 %ifarch x86_64
 export JAVA_LIB=$JAVA_HOME/jre/lib/amd64
 %else
+%ifarch sparcv9
+export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong}
+export JAVA_LIB=$JAVA_HOME/jre/lib/sparc
+%else
+%ifarch sparc64
+export JAVA_LIB=$JAVA_HOME/jre/lib/sparcv9
+%else
 export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch}
 %endif
+%endif
+%endif
 %configure --enable-shared
 make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 PATH=$PWD/src:$PATH
@@ -230,17 +239,22 @@
 
 
 %changelog
+* Mon Mar 02 2009 Dennis Gilmore <dennis at ausil.us> - 5.6.60-4
+- fix JAVA_HOME and JAVA_LIB for sparc arches
+
 * Wed Feb 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 5.6.60-3
 - Unify F9 and F10 changes:
-  - Fix java LIBDIRS on alpha (Oliver Falk)
 
 * Fri Sep 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.6.60-2
 - forgot to remove ANNOUNCE from doc list
-
+ 
 * Fri Sep 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.6.60-1
 - update to 5.6.60
 - use openjdk (FIXME: there may be a way to make this more generic)
 
+* Mon Feb 16 2009 Oliver Falk <oliver at linux-kernel.at> - 5.6.57-3
+- Fix java LIBDIRS on alpha
+
 * Wed Jul  2 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.57-2
 - Build using any Java
 - Include patch from SWI for Turkish locale (thanks to Keri Harris)




More information about the fedora-extras-commits mailing list