rpms/pl/devel pl-5.6.57-jpl-configure-s390x.patch, NONE, 1.1 pl.spec, 1.55, 1.56

[Karsten Hopp]

Author: karsten

Update of /cvs/extras/rpms/pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23556

Modified Files:
	pl.spec 
Added Files:
	pl-5.6.57-jpl-configure-s390x.patch 
Log Message:
- fix java LIBDIRS for mainframe, similar to alpha

pl-5.6.57-jpl-configure-s390x.patch:

--- NEW FILE pl-5.6.57-jpl-configure-s390x.patch ---
diff -up pl-5.7.6/packages/jpl/configure.s390x pl-5.7.6/packages/jpl/configure
--- pl-5.7.6/packages/jpl/configure.s390x	2009-03-01 16:42:25.000000000 +0100
+++ pl-5.7.6/packages/jpl/configure	2009-03-01 16:43:13.000000000 +0100
@@ -4632,6 +4632,14 @@ case "$host_cpu" in
 		_JNI_LIBDIRS="lib/ppc64"
 		_JNI_LIBSUBDIR="server"
 		;;
+	s390)
+		_JNI_LIBDIRS="lib/s390"
+		_JNI_LIBSUBDIR="server"
+		;;
+	s390x)
+		_JNI_LIBDIRS="lib/s390x"
+		_JNI_LIBSUBDIR="server"
+		;;
 	*)
 		_JNI_LIBDIRS=""
 esac


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- pl.spec	25 Feb 2009 12:10:14 -0000	1.55
+++ pl.spec	1 Mar 2009 15:48:36 -0000	1.56
@@ -3,7 +3,7 @@
 
 Name:		pl
 Version:	5.7.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -17,6 +17,7 @@
 Patch1:         %{name}-5.6.57-jpl-configure.patch
 Patch2:         %{name}-5.6.57-jpl-configure-alpha.patch
 Patch3:         %{name}-5.6.60-jni.patch
+Patch4:         %{name}-5.6.57-jpl-configure-s390x.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gmp-devel
@@ -103,6 +104,7 @@
 %patch1 -p1 -b .libjvm
 %patch2 -p1 -b .libjvm-alpha
 %patch3 -p1 -b .jni
+%patch4 -p1 -b .libjvm-s390X
 (
    mkdir doc-install
    cd doc-install
@@ -230,6 +232,9 @@
 
 
 %changelog
+* Sun Mar 01 2009 Karsten Hopp <karsten at redhat.com> 5.7.6-3
+- fix java LIBDIRS for mainframe, similar to alpha
+
 * Wed Feb 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 5.7.6-2
 - Unify all changes:
   - Fix java LIBDIRS on alpha (Oliver Falk)