Hello community,
here is the log from the commit of package clisp for openSUSE:Factory checked
in at 2013-07-02 06:44:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/clisp (Old)
and /work/SRC/openSUSE:Factory/.clisp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clisp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/clisp/clisp.changes 2013-05-27
09:43:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.clisp.new/clisp.changes 2013-07-02
06:44:55.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Jun 15 14:27:43 UTC 2013 - jeng...@inai.de
+
+- Add clisp-db6.diff to resolve compile abort with libdb-6.0
+- Remove unused %xarch macro; use automirror-selection Source URL
+
+-------------------------------------------------------------------
New:
----
clisp-db6.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clisp.spec ++++++
--- /var/tmp/diff_new_pack.Evdw9d/_old 2013-07-02 06:44:56.000000000 +0200
+++ /var/tmp/diff_new_pack.Evdw9d/_new 2013-07-02 06:44:56.000000000 +0200
@@ -20,41 +20,14 @@
%define min_suse_ver 1030
Name: clisp
-BuildRequires: db-devel
-BuildRequires: ffcall
-BuildRequires: gdbm-devel
-BuildRequires: gtk2-devel
-BuildRequires: libglade2-devel
-BuildRequires: libsigsegv-devel
-BuildRequires: openssl-devel
-BuildRequires: pcre-devel
-BuildRequires: postgresql-devel
-BuildRequires: readline-devel
-BuildRequires: screen
-BuildRequires: vim-data
-%if 0%{?suse_version} >= %min_suse_ver
-BuildRequires: dbus-1-devel
-BuildRequires: fdupes
-BuildRequires: xorg-x11-devel
-%endif
-#
-# If set to yes do not forget to add
-# gcc-c++
-# to BuildRequires
-#
-%define debug no
-Requires(pre): vim
-Requires(pre): vim-data
-Requires: ffcall
-Provides: %{name}-devel
-Suggests: %{name}-doc
Version: 2.49
Release: 0
Summary: A Common Lisp Interpreter
License: GPL-2.0+
Group: Development/Languages/Other
Url: http://clisp.cons.org
-Source0:
http://switch.dl.sourceforge.net/sourceforge/clisp/clisp-2.49.tar.bz2
+
+Source: http://downloads.sf.net/clisp/%name-%version.tar.bz2
Source3: clisp-rpmlintrc
Source4: README.SuSE
# PATCH-EXTEND-OPENSUSE Set the process execution domain
@@ -81,11 +54,39 @@
Patch14: clisp-hostname.patch
# PATCH-EXTEND-UPSTREAM Make armv7l work
Patch15: clisp-arm.patch
+Patch16: clisp-db6.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global vimdir %{_datadir}/vim/site/after/syntax
-%global xarch ppc64 s390x armv4l
ExcludeArch: ppc64 s390x armv4l
+BuildRequires: db-devel
+BuildRequires: ffcall
+BuildRequires: gdbm-devel
+BuildRequires: gtk2-devel
+BuildRequires: libglade2-devel
+BuildRequires: libsigsegv-devel
+BuildRequires: openssl-devel
+BuildRequires: pcre-devel
+BuildRequires: postgresql-devel
+BuildRequires: readline-devel
+BuildRequires: screen
+BuildRequires: vim-data
+%if 0%{?suse_version} >= %min_suse_ver
+BuildRequires: dbus-1-devel
+BuildRequires: fdupes
+BuildRequires: xorg-x11-devel
+%endif
+#
+# If set to yes do not forget to add
+# gcc-c++
+# to BuildRequires
+#
+%define debug no
+Requires(pre): vim
+Requires(pre): vim-data
+Requires: ffcall
+Provides: %{name}-devel
+Suggests: %{name}-doc
%description
Common Lisp is a high-level, all-purpose programming language. CLISP is
@@ -138,6 +139,7 @@
%endif
%patch14 -p0
%patch15 -p0
+%patch -P 16 -p1
%build
#
++++++ clisp-db6.diff ++++++
From: Jan Engelhardt <jeng...@inai.de>
Date: 2013-06-14 13:55:00.148814697 +0200
Work around compile abort with libdb-6.0
BDB has removed RPC support (which was not implemented anyway;
it [set_rpc_server] always returned EOPNOTSUPP even in libdb-4.8).
---
modules/berkeley-db/bdb.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
Index: clisp-2.49/modules/berkeley-db/bdb.c
===================================================================
--- clisp-2.49.orig/modules/berkeley-db/bdb.c
+++ clisp-2.49/modules/berkeley-db/bdb.c
@@ -64,6 +64,7 @@ static void vecout (unsigned char* v, in
this is a macro and not a function for NO_UNICODE */
#define asciz_to_string0(a,e) (a ? asciz_to_string(a,e) : NIL)
+#include <errno.h>
#include <db.h>
/*
http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/if.4.4.20.html
@@ -358,9 +359,14 @@ DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRY
# elif defined(DB_CLIENT) /* 4.1 and before */
SYSCALL(db_env_create,(&dbe,remote_p ? DB_CLIENT : 0));
# else
-# error how does your Berkeley DB create a remote client?
+ SYSCALL(db_env_create,(&dbe,0));
# endif
+
if (remote_p) {
+#if !defined(DB_RPCCLIENT) && !defined(DB_CLIENT)
+# warning No BDB RPC support
+ error_bdb(EOPNOTSUPP, "DBE-CREATE");
+#else
if (uint_p(STACK_0)) sv_timeout = I_to_uint(STACK_0);
if (uint_p(STACK_1)) cl_timeout = I_to_uint(STACK_1);
host_restart:
@@ -384,6 +390,7 @@ DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRY
STACK_2 = value1;
goto host_restart;
}
+#endif
}
if (!missingp(STACK_4)) /* :PASSWD */
dbe_set_encryption(dbe,&STACK_3,&STACK_4);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
