rpms/pl/devel pl.spec,1.45,1.46

[Mary Ellen Foster (mef)]

Author: mef

Update of /cvs/pkgs/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4912

Modified Files:
	pl.spec 
Log Message:
- Update to 5.6.50
- Enable jpl on i386 and x86_64



Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pl.spec	19 Feb 2008 03:44:24 -0000	1.45
+++ pl.spec	22 Feb 2008 16:29:08 -0000	1.46
@@ -1,13 +1,13 @@
 Name:		pl
-Version:	5.6.47
-Release:	9%{?dist}
+Version:	5.6.50
+Release:	1%{?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/pl-5.6.47.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/%{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:         pl-5.4.6-rpath.patch
@@ -31,7 +31,9 @@
 BuildRequires:  readline-devel
 BuildRequires:  unixODBC-devel
 BuildRequires:  freetype-devel
-#BuildRequires:  java-1.5.0-gcj-devel
+%ifnarch ppc64 ppc
+BuildRequires: java-devel-icedtea
+%endif
 Requires:       readline-devel
 
 %description
@@ -43,6 +45,21 @@
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
 
+%ifnarch ppc64 ppc
+%package jpl
+Summary: A bidirectional Prolog/Java interface for SWI Prolog
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+Requires: java-icedtea
+
+%description jpl
+JPL is a library using the SWI-Prolog foreign interface and the Java jni
+interface providing a bidirectional interface between Java and Prolog
+that can be used to embed Prolog in Java as well as for embedding Java
+in Prolog.  In both setups it provides a reentrant bidirectional interface
+%endif
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
@@ -54,9 +71,6 @@
    tar zxf %{SOURCE2}
 )
 find . -name CVS | xargs rm -fr
-sed -i 's|_JTOPDIR=.*|_JTOPDIR=/usr/lib/jvm/java|' packages/jpl/configure
-sed -i 's|-ljava||' packages/jpl/configure
-sed -i 's|-lverify||' packages/jpl/configure
 
 
 %build
@@ -64,7 +78,11 @@
 make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 PATH=$PWD/src:$PATH
 cd packages
+%ifarch ppc64 ppc
+%configure --without-jpl
+%else
 %configure
+%endif
 make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 cd ..
 
@@ -81,6 +99,11 @@
         libdir=$RPM_BUILD_ROOT%{_libdir} \
 	mandir=$RPM_BUILD_ROOT%{_mandir}/man1
 )
+%ifnarch ppc ppc64
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+mv $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/lib/jpl.jar $RPM_BUILD_ROOT%{_javadir}/jpl-%{version}.jar
+ln -s jpl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jpl.jar
+%endif
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/doc
@@ -97,11 +120,28 @@
 %doc dotfiles/dot*
 %doc doc-install/*
 %{_mandir}/man1/*
-%{_libdir}/pl*
+%{_libdir}/pl-%{version}
 %{_bindir}/*
+# Exclude the files that are in the jpl sub-package
+%exclude %{_libdir}/pl-%{version}/library/jpl.pl
+%exclude %{_libdir}/pl-%{version}/lib/*/libjpl.so
+
+%ifnarch ppc64 ppc
+%files jpl
+%doc packages/jpl/docs/*
+%{_javadir}/jpl-%{version}.jar
+%{_javadir}/jpl.jar
+%{_libdir}/pl-%{version}/library/jpl.pl
+%{_libdir}/pl-%{version}/lib/*/libjpl.so
+%endif
 
 
 %changelog
+* Fri Feb 22 2008 Mary Ellen foster <mefoster at gmail.com> - 5.6.50-1
+- Update to 5.6.50
+- Enable JPL (as a sub-package) -- NB: it only builds with icedtea for now,
+  so we disable that sub-package on ppc64 and ppc for the moment
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.6.47-9
 - Autorebuild for GCC 4.3