- added jni patch (fixes jni libdir detection in openjdk8/x86 case)

[packages/pl.git] / pl.spec

diff --git a/pl.spec b/pl.spec
index d7a1e317a4b8e2b52fd8dd6380498c15242a834a..cbd394bb6f28f6e5df04869db7c9054ef6fa1bbe 100644 (file)
--- a/pl.spec
+++ b/pl.spec
@@ -1,29 +1,35 @@
 #
 # TODO
-#      - maybe separate other prolog packages to rpm subpackages
+#      - maybe separate other prolog packages to rpm subpackages
 #
 # Conditional build:
 %bcond_without java            # Java bindings (so far, JPL only works with Sun Java and IBM Java)
 %bcond_without tests           # make check
 #
 
-%ifnarch %{x8664} i586 i686 pentium3 pentium4 athlon 
+%ifnarch %{x8664} i586 i686 pentium3 pentium4 athlon
 %undefine      with_java
 %endif
 
+# packages use SWI-Prolog own linker which doesn't understand -gdwarf* and
+# some -march= options passed to it by gcc
+# No poin in building debug packages without debug info
+%define                _enable_debug_packages  0
+
 Summary:       SWI Prolog Language
 Summary(pl.UTF-8):     Język SWI Prolog
 Name:          pl
-Version:       6.6.0
+Version:       7.2.3
 Release:       1
 License:       LGPL v2.1+
 Group:         Development/Languages
 #Source0Download: http://www.swi-prolog.org/download/stable
-Source0:       http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
-# Source0-md5: 75866dbdf361d883b3e441ccd00effda
+Source0:       http://www.swi-prolog.org/download/stable/src/swi%{name}-%{version}.tar.gz
+# Source0-md5: 67c182f18310f115b49f1e2195499e0c
 Patch0:                %{name}-clib-configure.patch
 Patch1:                %{name}-xpce-install.patch
 Patch2:                %{name}-format.patch
+Patch3:                %{name}-jni.patch
 URL:           http://www.swi-prolog.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -76,7 +82,7 @@ Summary:      Dynamic, bidirectional interface between SWI-Prolog and Java
 Summary(pl.UTF-8):     Dynamiczny, dwukierunkowy interfejs pomiędzy SWI-Prologiem a Javą
 Group:         Development/Languages
 Requires:      %{name} = %{version}-%{release}
-Requires:      java-sun
+Requires:      jdk
 
 %description jpl
 JPL 3.x is a dynamic, bidirectional interface between SWI-Prolog 5.2.0
@@ -143,37 +149,40 @@ zestaw GUI dla (SWI-)Prologu. Dostępne także dla Quintus i SICStus
 Prolog.
 
 %prep
-%setup -q
+%setup -q -n swi%{name}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+%{__mv} src/Tests/core/test_d_break.pl{,disabled}
 
 %build
+# packages use SWI-Prolog own linker which doesn't understand -gdwarf* and
+# some -march= options passed to it by gcc
+CFLAGS=$(echo %{rpmcflags} | sed 's|-march=[^ ]*||')
+export CFLAGS
+
 cd src
 cp -f /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
-%configure
+%configure \
+       PLARCH=%{_target_platform}
 %{__make}
 cd ..
 
 # the packages are written in Prolog itself
 PATH="$(pwd)/src:$PATH"; export PATH
-LD_LIBRARY_PATH="$(pwd)/lib/%{_target_cpu}-linux"; export LD_LIBRARY_PATH
+LD_LIBRARY_PATH="$(pwd)/lib/%{_target_platform}"; export LD_LIBRARY_PATH
 export CLASSPATH=.
 
-# packages use SWI-Prolog own linker which doesn't understand -gdwarf* and
-# some -march= options passed to it by gcc
-%undefine      debuginfocflags
-CFLAGS=$(echo %{rpmcflags} | sed 's|-march=[^ ]*||')
-export CFLAGS
-
 cd packages
 wd=`pwd`
 # see packages/configure for default packages list and their order
 for i in clib cpp odbc table xpce/src sgml RDF semweb http chr \
                clpqr nlp ssl tipc pldoc plunit %{?with_java:jpl} \
-               zlib R protobufs PDT utf8proc \
+               zlib protobufs PDT utf8proc archive pengines cql \
                inclpr ; do
        cd $i
        cp -f /usr/share/automake/config.sub .
@@ -197,11 +206,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 install -C src \
        DESTDIR=$RPM_BUILD_ROOT
 
-LD_LIBRARY_PATH="$RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/%{_target_cpu}-linux"; export LD_LIBRARY_PATH
+LD_LIBRARY_PATH="$RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/%{_target_platform}"; export LD_LIBRARY_PATH
 
 for i in clib cpp odbc table xpce/src sgml RDF semweb http chr \
                clpqr nlp ssl tipc pldoc plunit %{?with_java:jpl} \
-               zlib R protobufs \
+               zlib protobufs PDT utf8proc archive pengines cql \
                inclpr ; do
        PATH=$RPM_BUILD_ROOT%{_bindir}:$PATH \
        %{__make} -j1 install -C packages/$i \
@@ -228,12 +237,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/swipl-%{version}/bin
 %{_libdir}/swipl-%{version}/boot*
 %dir %{_libdir}/swipl-%{version}/lib
-%dir %{_libdir}/swipl-%{version}/lib/*-linux
-%attr(755,root,root) %{_libdir}/swipl-%{version}/lib/*-linux/*.so*
-%{_libdir}/swipl-%{version}/lib/*-linux/*.a
+%dir %{_libdir}/swipl-%{version}/lib/%{_target_platform}
+%attr(755,root,root) %{_libdir}/swipl-%{version}/lib/%{_target_platform}/*.so*
+%{_libdir}/swipl-%{version}/lib/%{_target_platform}/*.a
 %{_libdir}/swipl-%{version}/library
 %if %{with java}
-%exclude %{_libdir}/swipl-%{version}/lib/*-linux/libjpl.so
+%exclude %{_libdir}/swipl-%{version}/lib/%{_target_platform}/libjpl.so
 %exclude %{_libdir}/swipl-%{version}/library/jpl.pl
 %endif
 %{_libdir}/swipl-%{version}/include
@@ -245,7 +254,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files xpce
 %defattr(644,root,root,755)
-%doc packages/xpce/{EXTENDING,INFO,README,README-4.8,README.CXX,README.alpha,README.customise}
+%doc packages/xpce/{EXTENDING,INFO,README,README.CXX,README.customise}
 %attr(755,root,root) %{_bindir}/xpce-client
 %dir %{_libdir}/swipl-%{version}/xpce
 %{_libdir}/swipl-%{version}/xpce/Defaults*
@@ -259,7 +268,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with java}
 %files jpl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/swipl-%{version}/lib/*-linux/libjpl.so
+%attr(755,root,root) %{_libdir}/swipl-%{version}/lib/%{_target_platform}/libjpl.so
 %{_libdir}/swipl-%{version}/lib/jpl.jar
 %{_libdir}/swipl-%{version}/library/jpl.pl
 %endif