Attachment 293430 Details for Bug 303301 – Spec-file patch

[patch] Spec-file patch

pl.spec.diff (text/plain), 3.08 KB, created by Mary Ellen Foster on 2008-01-30 16:26:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mary Ellen Foster

Created: 2008-01-30 16:26:26 UTC

Size: 3.08 KB

patch

obsolete

>--- pl.spec.orig	2007-06-08 21:44:45.000000000 +0100
>+++ pl.spec	2008-01-30 16:01:58.000000000 +0000
>@@ -1,5 +1,5 @@
> Name:		pl
>-Version:	5.6.35
>+Version:	5.6.49
> Release:	1%{?dist}
> 
> Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
>@@ -7,11 +7,12 @@
> Group:		Development/Languages
> License:	LGPL
> 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
>+Patch2:         pl-5.6.49-jpl.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:  gmp-devel
> BuildRequires:  libICE-devel
>@@ -31,6 +32,9 @@
> BuildRequires:  readline-devel
> BuildRequires:  unixODBC-devel
> Buildrequires:  freetype-devel
>+%ifnarch ppc64 ppc
>+BuildRequires:  java-devel-icedtea
>+%endif
> Requires:       readline-devel
> 
> %description
>@@ -41,11 +45,25 @@
> XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
> 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
> %patch1 -p1 -b .multilib
>+%patch2 -p1 -b .jpl
> (
>    mkdir doc-install
>    cd doc-install
>@@ -60,7 +78,11 @@
> make COFLAGS="$RPM_OPT_FLAGS"
> PATH=$PWD/src:$PATH
> cd packages
>+%ifarch ppc64 ppc
> %configure --without-jpl
>+%else
>+%configure
>+%endif
> make COFLAGS="$RPM_OPT_FLAGS"
> cd ..
> 
>@@ -93,11 +115,29 @@
> %doc dotfiles/dot*
> %doc doc-install/*
> %{_mandir}/man1/*
>-%{_libdir}/pl*
> %{_bindir}/*
>+%{_libdir}/pl-%{version}
>+# Exclude the files that are in the jpl sub-package
>+%exclude %{_libdir}/pl-%{version}/library/jpl.pl
>+%exclude %{_libdir}/pl-%{version}/lib/jpl.jar
>+%exclude %{_libdir}/pl-%{version}/lib/*/libjpl.so
>+
>+%ifnarch ppc64 ppc
>+%files jpl
>+%doc packages/jpl/docs
>+%{_libdir}/pl-%{version}/library/jpl.pl
>+%{_libdir}/pl-%{version}/lib/jpl.jar
>+%{_libdir}/pl-%{version}/lib/*/libjpl.so
>+%endif
> 
> 
> %changelog
>+* Wed Jan 30 2008 Mary Ellen foster <mefoster at gmail.com> - 5.6.49-1
>+- Update to 5.6.49
>+- 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
>+- Temporarily include patch to jpl to avoid crashes
>+
> * Fri Jun  8 2007 Gerard Milmeister <gemi@bluewin.ch> - 5.6.35-1
> - new version 5.6.35
> - add requires readline-devel

Actions: View | Diff

Attachments on bug 303301: 293430