rpms/pl/F-10 pl-5.6.57-jpl-configure-alpha.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 pl.spec, 1.52, 1.53

[Mary Ellen Foster]

Author: mef

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

Modified Files:
	.cvsignore 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	19 Sep 2008 15:38:16 -0000	1.21
+++ .cvsignore	25 Feb 2009 12:10:13 -0000	1.22
@@ -1 +1,3 @@
 pl-5.6.60.tar.gz
+HTMLmanual.tar.gz
+userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-10/pl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- pl.spec	19 Sep 2008 16:10:44 -0000	1.52
+++ pl.spec	25 Feb 2009 12:10:13 -0000	1.53
@@ -3,7 +3,7 @@
 
 Name:		pl
 Version:	5.6.60
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -14,8 +14,10 @@
 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.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