rpms/pl/F-9 pl-5.6.52-jni.patch, NONE, 1.1 pl-5.6.55-configure.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 pl-5.6.52-fix-java-directory.patch, 1.1, 1.2 pl.spec, 1.48, 1.49 sources, 1.19, 1.20

Wed Jun 25 17:58:08 UTC 2008

Author: mef

Update of /cvs/pkgs/rpms/pl/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26439

Modified Files:
	.cvsignore pl-5.6.52-fix-java-directory.patch pl.spec sources 
Added Files:
	pl-5.6.52-jni.patch pl-5.6.55-configure.patch 
Log Message:
Check in pent-up updates

pl-5.6.52-jni.patch:

--- NEW FILE pl-5.6.52-jni.patch ---
diff -ur pl-5.6.52/packages/jpl.orig/jpl.pl pl-5.6.52/packages/jpl/jpl.pl
--- pl-5.6.52/packages/jpl.orig/jpl.pl	2008-03-12 20:33:08.000000000 +0100
+++ pl-5.6.52/packages/jpl/jpl.pl	2008-04-08 14:47:59.000000000 +0200
@@ -4390,7 +4390,8 @@
 :- 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 @@
 
 libjpl(File) :-
 	(   current_prolog_flag(unix, true)
-	->  File = foreign(libjpl)
+	->  File = jni(libjpl)
 	;   File = foreign(jpl)
 	).
 
diff -ur pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java
--- pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java	2008-03-12 20:33:08.000000000 +0100
+++ pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java	2008-04-08 14:17:08.000000000 +0200
@@ -79,7 +79,7 @@
  */
 public final class Prolog {
 	static {
-		System.loadLibrary("jpl");
+		System.load("LIBDIR/pl-jpl/libjpl.so");
 	}
 
 	/* term types */

pl-5.6.55-configure.patch:

--- NEW FILE pl-5.6.55-configure.patch ---
--- pl-5.6.55/src/configure.orig	2008-05-12 20:57:45.000000000 +0100
+++ pl-5.6.55/src/configure	2008-05-20 15:02:57.000000000 +0100
@@ -9480,7 +9480,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $ac_func ();
+extern int $ac_func;
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
@@ -9491,7 +9491,7 @@
 int
 main ()
 {
-return $ac_func ();
+return $ac_func;
   ;
   return 0;
 }
@@ -9592,7 +9592,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $ac_func ();
+extern int $ac_func;
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
@@ -9603,7 +9603,7 @@
 int
 main ()
 {
-return $ac_func ();
+return $ac_func;
   ;
   return 0;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	31 Mar 2008 14:16:55 -0000	1.19
+++ .cvsignore	25 Jun 2008 17:57:18 -0000	1.20
@@ -1,3 +1,3 @@
-pl-5.6.52.tar.gz
+pl-5.6.57.tar.gz
 HTMLmanual.tar.gz
 userguide.html.tgz

pl-5.6.52-fix-java-directory.patch:

Index: pl-5.6.52-fix-java-directory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-9/pl-5.6.52-fix-java-directory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pl-5.6.52-fix-java-directory.patch	31 Mar 2008 14:16:55 -0000	1.1
+++ pl-5.6.52-fix-java-directory.patch	25 Jun 2008 17:57:18 -0000	1.2
@@ -13,11 +13,11 @@
 -			_JNI_LIBDIRS=""
 -		esac
 +		_JNI_LIBDIRS="lib/ppc"
-+		_JNI_LIBSUBDIR="core"
++		_JNI_LIBSUBDIR="server"
 +		;;
 +	powerpc64)
 +		_JNI_LIBDIRS="lib/ppc64"
-+		_JNI_LIBSUBDIR="core"
++		_JNI_LIBSUBDIR="server"
  		;;
  	*)
  		_JNI_LIBDIRS=""


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-9/pl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pl.spec	31 Mar 2008 14:16:55 -0000	1.48
+++ pl.spec	25 Jun 2008 17:57:18 -0000	1.49
@@ -1,5 +1,14 @@
+%define build_jpl 0
+%if 0%{fedora} > 8
+%define build_jpl 1
+%else
+%ifnarch ppc ppc64
+%define build_jpl 1
+%endif
+%endif
+
 Name:		pl
-Version:	5.6.52
+Version:	5.6.57
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -10,9 +19,11 @@
 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
-Patch1:         pl-5.6.0-multilib.patch
-Patch2:         pl-5.6.52-fix-java-directory.patch
+Patch0:         %{name}-5.4.6-rpath.patch
+Patch1:         %{name}-5.6.0-multilib.patch
+Patch2:         %{name}-5.6.52-fix-java-directory.patch
+Patch3:         %{name}-5.6.52-jni.patch
+Patch4:         %{name}-5.6.55-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gmp-devel
 BuildRequires:  libICE-devel
@@ -32,8 +43,14 @@
 BuildRequires:  readline-devel
 BuildRequires:  unixODBC-devel
 BuildRequires:  freetype-devel
+%if %{build_jpl}
+BuildRequires:  jpackage-utils
+%if 0%{fedora} > 8
 BuildRequires:  java-devel-openjdk
-Requires:       readline-devel
+%else
+BuildRequires:  java-devel-icedtea
+%endif
+%endif
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -43,18 +60,59 @@
 XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
+%package devel
+Summary: Development files for SWI Prolog
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+Requires: readline-devel
+
+%description devel
+Development files for SWI Prolog.
+
+
+%package static
+Summary: Static library for SWI Prolog
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+Requires: readline-devel
+
+%description static
+Static libraryfor SWI Prolog.
+
+# %package xpce
+# Summary: A toolkit for developing graphical applications in Prolog
+# Group: Development/Languages
+# Requires: %{name} = %{version}-%{release}
+
+# %description xpce
+# XPCE is a toolkit for developing graphical applications in Prolog and other
+# interactive and dynamically typed languages. XPCE follows a rather unique
+# approach of for developing GUI applications, as follows:
+
+# - Add object layer to Prolog
+# - High level of abstraction
+# - Exploit rapid Prolog development cycle
+# - Platform independent programs
 
+
+%if %{build_jpl}
 %package jpl
 Summary: A bidirectional Prolog/Java interface for SWI Prolog
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-Requires: java-sdk-openjdk
+%if 0%{fedora} > 8
+Requires: java-openjdk
+%else
+Requires: java-icedtea
+%endif
+Requires: jpackage-utils
 
 %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
@@ -62,20 +120,34 @@
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .libjvm
+%patch3 -p1 -b .jni
+# %patch4 -p1 -b .config
 (
    mkdir doc-install
    cd doc-install
    tar zxf %{SOURCE1}
+)
+(
+   mkdir xpce-doc
+   cd xpce-doc
    tar zxf %{SOURCE2}
 )
 
+# Adjustments to take into account the new location of JNI stuff
+sed --in-place=.jni2 -e 's#LIBDIR#%{_libdir}#g' packages/jpl/jpl.pl
+sed --in-place=.jni2 -e 's#LIBDIR#%{_libdir}#g' packages/jpl/src/java/jpl/fli/Prolog.java
+
 
 %build
 %configure --enable-shared
 make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 PATH=$PWD/src:$PATH
 cd packages
+%if %{build_jpl}
 %configure
+%else
+%configure --without-jpl
+%endif
 make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 cd ..
 
@@ -86,17 +158,38 @@
 %makeinstall
 (cd packages && \
  PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make rpm-install \
-	PLBASE=$RPM_BUILD_ROOT%{_libdir}/pl-%{version} \
+	PLBASE=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
         bindir=$RPM_BUILD_ROOT%{_bindir} \
         libdir=$RPM_BUILD_ROOT%{_libdir} \
 	mandir=$RPM_BUILD_ROOT%{_mandir}/man1
 )
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/doc
-rm -fr $RPM_BUILD_ROOT%{_mandir}/man3/readline*
-
+%if %{build_jpl}
+# Move the JPL JNI stuff to where the Java packaging guidelines 
+# say it should be
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/lib/*/libjpl.so \
+        $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/lib/jpl.jar \
+        $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/
+%endif
+
+# Move the various include files into /usr/include
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include/*.h \
+        $RPM_BUILD_ROOT%{_includedir}/%{name}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include/* \
+        $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include
+
+# Clean up the other stuff that shouldn't be packaged
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/man
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/doc
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man3/readline*
+find packages/jpl/examples -name "*.class" | xargs rm -f
+find packages/jpl/examples -name ".cvsignore" | xargs rm -f
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -105,24 +198,81 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README COPYING ANNOUNCE VERSION
-%doc dotfiles/dot*
+%doc dotfiles/dotplrc
 %doc doc-install/*
+%doc xpce-doc/*
 %{_mandir}/man1/*
-%{_libdir}/pl-%{version}
+%dir %{_libdir}/%{name}-%{version}
+%{_libdir}/%{name}-%{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
-%exclude %{_libdir}/pl-%{version}/lib/jpl.jar
+# Exclude the files that are in the sub-packages
+%if %{build_jpl}
+# JPL
+%exclude %{_libdir}/%{name}-%{version}/library/jpl.pl
+%endif
+# Devel
+%exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.so
+# Static
+%exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.a
+# XPCE
+# %exclude %{_bindir}/xpce*
+# %exclude %{_libdir}/%{name}-%{version}/bin/*/xpce
+# %exclude %{_libdir}/%{name}-%{version}/dotfiles/dotxpcerc
+# %exclude %{_libdir}/%{name}-%{version}/xpce*
+# %exclude %{_libdir}/%{name}-%{version}/library/http/xpce_httpd.pl
+
+# %files xpce
+# %defattr(-,root,root,-)
+# %doc xpce-doc/*
+# %doc dotfiles/dotxpcerc
+# %{_bindir}/xpce*
+# %{_includedir}/%{name}/xpce
+# %{_libdir}/%{name}-%{version}/bin/*/xpce
+# %{_libdir}/%{name}-%{version}/xpce*
+# %{_libdir}/%{name}-%{version}/library/http/xpce_httpd.pl
 
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*.h
+%{_includedir}/%{name}/xpce
+%{_libdir}/%{name}-%{version}/lib/*/libpl.so
+
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/%{name}-%{version}/lib/*/libpl.a
+
+%if %{build_jpl}
 %files jpl
 %doc packages/jpl/docs/*
-%{_libdir}/pl-%{version}/library/jpl.pl
-%{_libdir}/pl-%{version}/lib/*/libjpl.so
-%{_libdir}/pl-%{version}/lib/jpl.jar
+%doc packages/jpl/examples
+%{_libdir}/%{name}-%{version}/library/jpl.pl
+%{_libdir}/%{name}-jpl
+%endif
 
 
 %changelog
+* Wed Jun 25 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.57-1
+- Another update, after vacation
+
+* Mon May 19 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.55-1
+- Update to 5.6.55 (wow, fast updates!)
+- Un-split xpce for now
+- Conditionally build jpl (on Fedora 9 with openjdk, and on 
+  Fedora 8 non-ppc with icedtea)
+
+* Wed May 07 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.54-1
+- Update to 5.6.54 and prepare to actually push this
+- Try splitting xpce into own package
+
+* Tue Apr 15 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.53-1
+- Update to 5.6.53 -- fixes ppc64 problems, yay!
+
+* Wed Apr 09 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.52-2
+- Put JPL stuff where the new Java packaging guidelines say it should be
+  and make all of the necessary adjustments in other files
+- Split out "-devel" and "-static" packages per guidelines
+
 * Mon Mar 31 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.52-1
 - Switch jpl requirement from IcedTea to OpenJDK and enable it everywhere
 - Upgrade to 5.6.52


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	31 Mar 2008 14:16:55 -0000	1.19
+++ sources	25 Jun 2008 17:57:18 -0000	1.20
@@ -1,3 +1,3 @@
-3b15a61d4e395cf85118ecb8905b245e  pl-5.6.52.tar.gz
-100d98b2339e250353876dcfaec0ff49  HTMLmanual.tar.gz
+c41709e50dbcd784f26273a1686af9e8  pl-5.6.57.tar.gz
+f9957ad2fcdce7e02512e0fbdc66e41d  HTMLmanual.tar.gz
 a4462019611caa4f69247c8bf94404a7  userguide.html.tgz


