rpms/pl/devel pl-5.6.57-jpl-configure-alpha.patch, NONE, 1.1 pl.spec, 1.54, 1.55

[Mary Ellen Foster]

Author: mef

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

Modified Files:
	pl.spec 
Added Files:
	pl-5.6.57-jpl-configure-alpha.patch 
Log Message:
Unify changes across all versions

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

--- NEW FILE pl-5.6.57-jpl-configure-alpha.patch ---
diff -up pl-5.6.57/packages/jpl/configure.alpha pl-5.6.57/packages/jpl/configure
--- pl-5.6.57/packages/jpl/configure.alpha	2009-02-10 12:53:01.000000000 +0100
+++ pl-5.6.57/packages/jpl/configure	2009-02-10 12:53:24.000000000 +0100
@@ -4614,6 +4614,10 @@ case "$host_cpu" in
 		_JNI_LIBDIRS="lib/amd64"
 		_JNI_LIBSUBDIR="server"
 		;;
+	alpha*)
+		_JNI_LIBDIRS="lib/alpha"
+		_JNI_LIBSUBDIR="server"
+		;;
 	powerpc)
 		_JNI_LIBDIRS="lib/ppc"
 		_JNI_LIBSUBDIR="server"


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- pl.spec	25 Feb 2009 09:43:59 -0000	1.54
+++ pl.spec	25 Feb 2009 12:10:14 -0000	1.55
@@ -3,19 +3,21 @@
 
 Name:		pl
 Version:	5.7.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
 License:	LGPLv2+
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/%{name}-%{version}.tar.gz
+Source:		http://www.swi-prolog.org/download/devel/src/%{name}-%{version}.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         %{name}-5.4.6-rpath.patch
-Patch2:         %{name}-5.6.57-jpl-configure.patch
+Patch1:         %{name}-5.6.57-jpl-configure.patch
+Patch2:         %{name}-5.6.57-jpl-configure-alpha.patch
 Patch3:         %{name}-5.6.60-jni.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gmp-devel
 BuildRequires:  libICE-devel
@@ -98,7 +100,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
-%patch2 -p1 -b .libjvm
+%patch1 -p1 -b .libjvm
+%patch2 -p1 -b .libjvm-alpha
 %patch3 -p1 -b .jni
 (
    mkdir doc-install
@@ -227,6 +230,10 @@
 
 
 %changelog
+* 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)
+
 * Wed Feb 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 5.7.6-1
 - Update to version 5.7
   - Cleaned up virtual machine and compiler