rpms/pl/F-8 .cvsignore, 1.15, 1.16 pl.spec, 1.34, 1.35 sources, 1.15, 1.16

Wed Jun 25 18:00:34 UTC 2008

Author: mef

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

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
Check in pent-up updates


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16

--- .cvsignore	8 Jun 2007 20:44:45 -0000	1.15
+++ .cvsignore	25 Jun 2008 17:59:43 -0000	1.16
@@ -1,3 +1,3 @@
-pl-5.6.35.tar.gz
+pl-5.6.57.tar.gz
 HTMLmanual.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-8/pl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pl.spec	8 Jun 2007 20:44:45 -0000	1.34
+++ pl.spec	25 Jun 2008 17:59:43 -0000	1.35
@@ -1,17 +1,29 @@
+%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.35
+Version:	5.6.57
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
-License:	LGPL
+License:	LGPLv2+
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.35.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
-Patch1:         pl-5.6.0-multilib.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
@@ -30,8 +42,15 @@
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  unixODBC-devel
-Buildrequires:  freetype-devel
-Requires:       readline-devel
+BuildRequires:  freetype-devel
+%if %{build_jpl}
+BuildRequires:  jpackage-utils
+%if 0%{fedora} > 8
+BuildRequires:  java-devel-openjdk
+%else
+BuildRequires:  java-devel-icedtea
+%endif
+%endif
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -41,27 +60,95 @@
 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}
+%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
 %setup -q
 %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}
 )
-find . -name CVS | xargs rm -fr
+
+# 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
-make COFLAGS="$RPM_OPT_FLAGS"
+%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
-make COFLAGS="$RPM_OPT_FLAGS"
+%endif
+make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 cd ..
 
 
@@ -71,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
@@ -90,14 +198,110 @@
 %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*
+%dir %{_libdir}/%{name}-%{version}
+%{_libdir}/%{name}-%{version}/*
 %{_bindir}/*
+# 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/*
+%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
+- Patch jpl configure script to find Java libraries on ppc{64}
+- NB: Still broken on ppc64, still trying to figure out why
+
+* Mon Feb 25 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.51-1
+- Upgrade to 5.6.51
+
+* 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
+
+* Thu Dec  6 2007 Gerard Milmeister <gemi at bluewin.ch> - 5.6.47-8
+- compile with -fno-strict-aliasing
+
+* Wed Dec  5 2007 Gerard Milmeister <gemi at bluewin.ch> - 5.6.47-5
+- disable jpl for now
+
+* Wed Dec  5 2007 Gerard Milmeister <gemi at bluewin.ch> - 5.6.47-4
+- enable shared library building
+
+* Wed Dec  5 2007 Gerard Milmeister <gemi at bluewin.ch> - 5.6.47-1
+- new release 5.6.47
+
 * Fri Jun  8 2007 Gerard Milmeister <gemi at bluewin.ch> - 5.6.35-1
 - new version 5.6.35
 - add requires readline-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	8 Jun 2007 20:44:45 -0000	1.15
+++ sources	25 Jun 2008 17:59:43 -0000	1.16
@@ -1,3 +1,3 @@
-0a8f8cea0de58d627a5e9819d1373811  pl-5.6.35.tar.gz
-29115fca7e2624a6652ece8e17cba2f6  HTMLmanual.tar.gz
-72feb8797f134c45be719133873cae1f  userguide.html.tgz
+c41709e50dbcd784f26273a1686af9e8  pl-5.6.57.tar.gz
+f9957ad2fcdce7e02512e0fbdc66e41d  HTMLmanual.tar.gz
+a4462019611caa4f69247c8bf94404a7  userguide.html.tgz


