rpms/pl/F-9 pl-5.6.60-jni.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 pl.spec, 1.51, 1.52 sources, 1.20, 1.21

[Mary Ellen Foster]

Author: mef

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

Modified Files:
	.cvsignore pl.spec sources 
Added Files:
	pl-5.6.60-jni.patch 
Log Message:
Unify changes across all versions

pl-5.6.60-jni.patch:

--- NEW FILE pl-5.6.60-jni.patch ---
diff -up pl-5.6.60/packages/jpl/jpl.pl.jni pl-5.6.60/packages/jpl/jpl.pl
--- pl-5.6.60/packages/jpl/jpl.pl.jni	2008-09-15 09:34:38.000000000 -0400
+++ pl-5.6.60/packages/jpl/jpl.pl	2008-09-19 10:25:37.000000000 -0400
@@ -4390,7 +4390,8 @@ prolog:error_message(java_exception(Ex))
 :- multifile user:file_search_path/2.
 :- dynamic   user:file_search_path/2.
 
-user:file_search_path(jar, swi(lib)).
+user:file_search_path(jar, 'LIBDIR/pl-jpl').
+user:file_search_path(jni, 'LIBDIR/pl-jpl').
 
 %%	add_search_path(+Var, +Value) is det.
 %
@@ -4534,7 +4535,7 @@ add_jpl_to_classpath :-
 
 libjpl(File) :-
 	(   current_prolog_flag(unix, true)
-	->  File = foreign(libjpl)
+	->  File = jni(libjpl)
 	;   File = foreign(jpl)
 	).
 
diff -up pl-5.6.60/packages/jpl/src/java/jpl/fli/Prolog.java.jni pl-5.6.60/packages/jpl/src/java/jpl/fli/Prolog.java


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Jun 2008 17:57:18 -0000	1.20
+++ .cvsignore	25 Feb 2009 12:10:13 -0000	1.21
@@ -1,3 +1,3 @@
-pl-5.6.57.tar.gz
+pl-5.6.60.tar.gz
 HTMLmanual.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-9/pl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pl.spec	16 Feb 2009 22:22:57 -0000	1.51
+++ pl.spec	25 Feb 2009 12:10:13 -0000	1.52
@@ -1,5 +1,8 @@
+%define jdkvershort 1.6.0
+%define jdkverlong %{jdkvershort}.0
+
 Name:		pl
-Version:	5.6.57
+Version:	5.6.60
 Release:	3%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -11,11 +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
-Patch1:         %{name}-5.6.0-multilib.patch
-Patch2:         %{name}-5.6.57-jpl-configure.patch
-Patch3:         %{name}-5.6.52-jni.patch
-Patch4:         %{name}-5.6.57-locale.patch
-Patch5:		%{name}-5.6.57-jpl-configure-alpha.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
@@ -36,7 +38,7 @@
 BuildRequires:  unixODBC-devel
 BuildRequires:  freetype-devel
 BuildRequires:  jpackage-utils
-BuildRequires:  java-devel
+BuildRequires:  java-%{jdkvershort}-devel = 1:%{jdkverlong}
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -50,7 +52,7 @@
 Summary: Development files for SWI Prolog
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-Requires: readline-devel
+Requires: readline-devel, pkgconfig
 
 %description devel
 Development files for SWI Prolog.
@@ -98,11 +100,9 @@
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
-%patch1 -p1 -b .multilib
-%patch2 -p1 -b .libjvm
+%patch1 -p1 -b .libjvm
+%patch2 -p1 -b .libjvm-alpha
 %patch3 -p1 -b .jni
-%patch4 -p1 -b .locale
-%patch5 -p1 -b .libjvm-alpha
 (
    mkdir doc-install
    cd doc-install
@@ -120,12 +120,18 @@
 
 
 %build
+export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong}.%{_arch}
+%ifarch x86_64
+export JAVA_LIB=$JAVA_HOME/jre/lib/amd64
+%else
+export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch}
+%endif
 %configure --enable-shared
 make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 PATH=$PWD/src:$PATH
 cd packages
 %configure
-make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" JAVALIBS="-L$JAVA_LIB/server -L$JAVA_LIB -ljava -lverify -ljvm"
 cd ..
 
 
@@ -172,7 +178,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README COPYING ANNOUNCE VERSION
+%doc ChangeLog README COPYING VERSION
 %doc dotfiles/dotplrc
 %doc doc-install/*
 %doc xpce-doc/*
@@ -210,6 +216,7 @@
 %{_includedir}/%{name}/*.h
 %{_includedir}/%{name}/xpce
 %{_libdir}/%{name}-%{version}/lib/*/libpl.so
+%{_libdir}/pkgconfig/pl.pc
 
 %files static
 %defattr(-,root,root,-)
@@ -223,6 +230,11 @@
 
 
 %changelog
+* Wed Feb 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 5.6.60-3
+- Unify F9 and F10 changes:
+  - Update to 5.6.60 (Tom Callaway)
+  - Use openjdk (Tom Callaway)
+
 * Mon Feb 16 2009 Oliver Falk <oliver at linux-kernel.at> - 5.6.57-3
 - Fix java LIBDIRS on alpha
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	25 Jun 2008 17:57:18 -0000	1.20
+++ sources	25 Feb 2009 12:10:13 -0000	1.21
@@ -1,3 +1,3 @@
-c41709e50dbcd784f26273a1686af9e8  pl-5.6.57.tar.gz
+3e5c3d29d7c0f86351707c8d0415ac7b  pl-5.6.60.tar.gz
 f9957ad2fcdce7e02512e0fbdc66e41d  HTMLmanual.tar.gz
 a4462019611caa4f69247c8bf94404a7  userguide.html.tgz