Hello community,
here is the log from the commit of package swipl for openSUSE:Factory checked
in at 2014-07-24 06:58:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/swipl (Old)
and /work/SRC/openSUSE:Factory/.swipl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swipl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/swipl/swipl.changes 2013-12-24
20:01:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.swipl.new/swipl.changes 2014-07-24
06:58:52.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Jul 23 11:54:49 UTC 2014 - dval...@suse.com
+
+- update swipl-ppc64.patch to fix powerpc builds
+ ppc64le now have ppc64 as java_libarch
+
+-------------------------------------------------------------------
+Tue Jul 22 08:06:57 UTC 2014 - mihai...@gmail.com
+
+- Update to version 6.6.6
+
+-------------------------------------------------------------------
Old:
----
pl-5.10.2.tar.bz2
New:
----
pl-6.6.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ swipl.spec ++++++
--- /var/tmp/diff_new_pack.9eHPXd/_old 2014-07-24 06:58:53.000000000 +0200
+++ /var/tmp/diff_new_pack.9eHPXd/_new 2014-07-24 06:58:53.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package swipl
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,12 +34,15 @@
BuildRequires: xorg-x11
BuildRequires: xorg-x11-Xvfb
BuildRequires: xorg-x11-devel
-Version: 5.10.2
+%if 0%{?suse_version} <= 1230
+BuildRequires: javapackages-tools
+%endif
+Version: 6.6.6
Release: 0
Summary: Prolog Compiler
License: GPL-2.0+ and LGPL-2.1+
Group: Development/Languages/Other
-Source: pl-%{version}.tar.bz2
+Source: pl-%{version}.tar.gz
Source1: refman.pdf
Patch0: pl.patch
Patch1: pkgconfig.patch
@@ -116,5 +119,6 @@
%{_mandir}/man1/swipl-ld.1.gz
%{_mandir}/man1/swipl-rc.1.gz
%{_mandir}/man1/swipl.1.gz
+%{_mandir}/man1/xpce-client.1.gz
%changelog
++++++ internal_fix.patch ++++++
--- /var/tmp/diff_new_pack.9eHPXd/_old 2014-07-24 06:58:53.000000000 +0200
+++ /var/tmp/diff_new_pack.9eHPXd/_new 2014-07-24 06:58:53.000000000 +0200
@@ -1,8 +1,7 @@
-Index: pl-5.10.2/src/pl-comp.c
-===================================================================
---- pl-5.10.2.orig/src/pl-comp.c 2010-10-28 21:38:25.000000000 +0200
-+++ pl-5.10.2/src/pl-comp.c 2010-12-18 20:12:34.600439331 +0100
-@@ -2143,6 +2143,7 @@ compileArithArgument(Word arg, compileIn
+diff -Pdpru pl-6.6.6/src/pl-comp.c pl-6.6.6-mod/src/pl-comp.c
+--- pl-6.6.6/src/pl-comp.c 2014-05-28 18:53:51.000000000 +0900
++++ pl-6.6.6-mod/src/pl-comp.c 2014-07-22 21:19:59.748381642 +0900
+@@ -2781,6 +2781,7 @@ compileArithArgument(Word arg, compileIn
} else /* GMP */
{ Output_n(ci, A_MPZ, p, n+1);
}
@@ -10,7 +9,7 @@
}
succeed;
}
-@@ -2558,6 +2559,7 @@ forAtomsInClause(Clause clause, void (fu
+@@ -3282,6 +3283,7 @@ forAtomsInClause(Clause clause, void (fu
PL_unregister_atom(w);
break;
}
++++++ pkgconfig.patch ++++++
--- /var/tmp/diff_new_pack.9eHPXd/_old 2014-07-24 06:58:53.000000000 +0200
+++ /var/tmp/diff_new_pack.9eHPXd/_new 2014-07-24 06:58:53.000000000 +0200
@@ -1,6 +1,6 @@
-diff -Pdru pl-5.10.2.orig/src/swipl.pc.in pl-5.10.2/src/swipl.pc.in
---- pl-5.10.2.orig/src/swipl.pc.in 2012-04-20 20:40:53.810629746 +0100
-+++ pl-5.10.2/src/swipl.pc.in 2012-04-20 20:48:51.314727003 +0100
+diff -Pdpru pl-6.6.6/src/swipl.pc.in pl-6.6.6-mod/src/swipl.pc.in
+--- pl-6.6.6/src/swipl.pc.in 2014-05-28 18:53:51.000000000 +0900
++++ pl-6.6.6-mod/src/swipl.pc.in 2014-07-22 21:19:43.812382295 +0900
@@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -8,6 +8,5 @@
-includedir=@includedir@
+includedir=${libdir}/@PL@-@PLVERSION@/include
- PLBASE=${libdir}/@PL@-@PLVERSION@
- PLARCH=@ARCH@
-
+ PLBASE=@PLBASE@
+ PLARCH=@PLARCH@
++++++ pl.patch ++++++
--- /var/tmp/diff_new_pack.9eHPXd/_old 2014-07-24 06:58:53.000000000 +0200
+++ /var/tmp/diff_new_pack.9eHPXd/_new 2014-07-24 06:58:53.000000000 +0200
@@ -1,8 +1,7 @@
-Index: pl-5.10.2/packages/plunit/Makefile.in
-===================================================================
---- pl-5.10.2.orig/packages/plunit/Makefile.in 2010-10-28 21:38:25.000000000
+0200
-+++ pl-5.10.2/packages/plunit/Makefile.in 2010-12-18 20:05:48.923438329
+0100
-@@ -52,7 +52,6 @@ ln-install: $(LIBPL)
+diff -Pdpru pl-6.6.6/packages/plunit/Makefile.in
pl-6.6.6-mod/packages/plunit/Makefile.in
+--- pl-6.6.6/packages/plunit/Makefile.in 2014-04-02 18:30:12.000000000
+0900
++++ pl-6.6.6-mod/packages/plunit/Makefile.in 2014-07-22 21:15:06.735393637
+0900
+@@ -34,7 +34,6 @@ ln-install: $(addprefix $(srcdir)/, $(LI
rpm-install: install
pdf-install: install-examples
@@ -10,17 +9,3 @@
html-install: install-examples
$(INSTALL_DATA) $(DOC).html $(DESTDIR)$(PKGDOC)
-Index: pl-5.10.2/src/pl-trace.c
-===================================================================
---- pl-5.10.2.orig/src/pl-trace.c 2010-10-28 21:38:25.000000000 +0200
-+++ pl-5.10.2/src/pl-trace.c 2010-12-18 20:05:48.925439596 +0100
-@@ -675,8 +675,7 @@ traceAction(char *cmd, int port, LocalFr
- if ( !(port & EXIT_PORT) )
- clear(frame, FR_SKIPPED);
- return ACTION_CONTINUE;
-- case '\04':
-- case EOF: FeedBack("EOF: ");
-+ case '\04': FeedBack("EOF: ");
- case 'e': FeedBack("exit\n");
- exitFromDebugger(0);
- case 'f': FeedBack("fail\n");
++++++ swipl-ppc64.patch ++++++
--- /var/tmp/diff_new_pack.9eHPXd/_old 2014-07-24 06:58:53.000000000 +0200
+++ /var/tmp/diff_new_pack.9eHPXd/_new 2014-07-24 06:58:53.000000000 +0200
@@ -1,12 +1,12 @@
-Index: pl-5.10.2/packages/jpl/ac/ac_jni_include_dirs.m4
+Index: pl-6.6.6/packages/jpl/ac/ac_jni_include_dirs.m4
===================================================================
---- pl-5.10.2.orig/packages/jpl/ac/ac_jni_include_dirs.m4
-+++ pl-5.10.2/packages/jpl/ac/ac_jni_include_dirs.m4
-@@ -78,6 +78,26 @@ case "$host_cpu" in
+--- pl-6.6.6.orig/packages/jpl/ac/ac_jni_include_dirs.m4
++++ pl-6.6.6/packages/jpl/ac/ac_jni_include_dirs.m4
+@@ -93,6 +93,16 @@ mingw32*) JNI_CLIENT_DIRS="$_JTOPD
_JNI_LIBDIRS=""
esac
;;
-+ powerpc64)
++ powerpc64*)
+ case "$host_os" in
+ linux*)
+ _JNI_LIBDIRS="lib/ppc64 bin"
@@ -16,44 +16,24 @@
+ _JNI_LIBDIRS=""
+ esac
+ ;;
-+ powerpc64le)
-+ case "$host_os" in
-+ linux*)
-+ _JNI_LIBDIRS="lib/ppc64le bin"
-+ _JNI_LIBSUBDIRS="server classic"
-+ ;;
-+ *)
-+ _JNI_LIBDIRS=""
-+ esac
-+ ;;
- *)
+ *)
# Fallback option should work on all architectures except
# amd64 and powerpc which are special cased above.
-Index: pl-5.10.2/packages/jpl/configure
+Index: pl-6.6.6/packages/jpl/configure
===================================================================
---- pl-5.10.2.orig/packages/jpl/configure
-+++ pl-5.10.2/packages/jpl/configure
-@@ -5213,6 +5213,26 @@ case "$host_cpu" in
+--- pl-6.6.6.orig/packages/jpl/configure
++++ pl-6.6.6/packages/jpl/configure
+@@ -5635,6 +5635,16 @@ mingw32*) JNI_CLIENT_DIRS="$_JTOPD
_JNI_LIBDIRS=""
esac
;;
-+ powerpc64)
++ powerpc64*)
+ case "$host_os" in
+ linux*)
+ _JNI_LIBDIRS="lib/ppc64 bin"
+ _JNI_LIBSUBDIRS="server classic"
+ ;;
+ *)
-+ _JNI_LIBDIRS=""
-+ esac
-+ ;;
-+ powerpc64le)
-+ case "$host_os" in
-+ linux*)
-+ _JNI_LIBDIRS="lib/ppc64le bin"
-+ _JNI_LIBSUBDIRS="server classic"
-+ ;;
-+ *)
+ _JNI_LIBDIRS=""
+ esac
+ ;;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
