OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Oct-2006 13:07:24
Branch: OPENPKG_2_STABLE Handle: 2006102412072400
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/mdbtools mdbtools.patch mdbtools.spec
Log:
MFC: do not use parallel build and do not include <locale.h> as
Solaris 10 then wants to include a <libintl.h> which isn't the gettext
one
Summary:
Revision Changes Path
1.3.2.3 +26 -4 openpkg-src/mdbtools/mdbtools.patch
1.7.2.3 +2 -2 openpkg-src/mdbtools/mdbtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mdbtools/mdbtools.patch
============================================================================
$ cvs diff -u -r1.3.2.2 -r1.3.2.3 mdbtools.patch
--- openpkg-src/mdbtools/mdbtools.patch 16 Oct 2006 14:52:35 -0000
1.3.2.2
+++ openpkg-src/mdbtools/mdbtools.patch 24 Oct 2006 11:07:24 -0000
1.3.2.3
@@ -1,6 +1,6 @@
Index: configure
--- configure.orig 2004-06-18 11:34:27 +0200
-+++ configure 2006-10-01 13:46:05 +0200
++++ configure 2006-10-24 12:35:57 +0200
@@ -20124,7 +20124,7 @@
echo "${ECHO_T}$ac_cv_lib_readline_add_history" >&6
if test $ac_cv_lib_readline_add_history = yes; then
@@ -12,7 +12,7 @@
#define HAVE_READLINE 1
Index: include/mdbsql.h
--- include/mdbsql.h.orig 2004-03-07 00:59:54 +0100
-+++ include/mdbsql.h 2006-10-01 13:46:05 +0200
++++ include/mdbsql.h 2006-10-24 12:35:57 +0200
@@ -6,6 +6,10 @@
#ifndef _mdbsql_h_
#define _mdbsql_h_
@@ -34,7 +34,7 @@
#endif
Index: include/mdbtools.h
--- include/mdbtools.h.orig 2004-06-17 01:42:19 +0200
-+++ include/mdbtools.h 2006-10-01 13:46:05 +0200
++++ include/mdbtools.h 2006-10-24 12:35:57 +0200
@@ -41,6 +41,10 @@
#define MDB_MEMO_OVERHEAD 12
#define MDB_BIND_SIZE 16384
@@ -64,9 +64,20 @@
+}
+#endif
#endif /* _mdbtools_h_ */
+Index: src/libmdb/mem.c
+--- src/libmdb/mem.c.orig 2004-05-30 07:06:27 +0200
++++ src/libmdb/mem.c 2006-10-24 12:36:22 +0200
+@@ -18,7 +18,6 @@
+ */
+
+ #include "mdbtools.h"
+-#include <locale.h>
+
+ #ifdef DMALLOC
+ #include "dmalloc.h"
Index: src/util/Makefile.in
--- src/util/Makefile.in.orig 2004-06-18 11:34:23 +0200
-+++ src/util/Makefile.in 2006-10-01 13:47:36 +0200
++++ src/util/Makefile.in 2006-10-24 12:35:57 +0200
@@ -156,7 +156,7 @@
bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv
mdb-header mdb-sql mdb-ver mdb-prop mdb-import prtable prcat prdata prkkd
prdump prole updrow prindex
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
@@ -76,3 +87,14 @@
subdir = src/util
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+Index: src/util/mdb-ver.c
+--- src/util/mdb-ver.c.orig 2004-04-14 07:58:53 +0200
++++ src/util/mdb-ver.c 2006-10-24 12:36:14 +0200
+@@ -20,7 +20,6 @@
+ #include "mdbtools.h"
+ #include "mdbver.h"
+ #include "mdbprivate.h"
+-#include <locale.h>
+
+ #ifdef DMALLOC
+ #include "dmalloc.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mdbtools/mdbtools.spec
============================================================================
$ cvs diff -u -r1.7.2.2 -r1.7.2.3 mdbtools.spec
--- openpkg-src/mdbtools/mdbtools.spec 16 Oct 2006 14:52:35 -0000
1.7.2.2
+++ openpkg-src/mdbtools/mdbtools.spec 24 Oct 2006 11:07:24 -0000
1.7.2.3
@@ -33,7 +33,7 @@
Group: Database
License: LGPL/GPL
Version: 0.6pre1
-Release: 2.20061018
+Release: 2.20061024
# list of sources
Source0:
http://switch.dl.sourceforge.net/mdbtools/mdbtools-%{version}.tar.gz
@@ -77,7 +77,7 @@
./configure \
--prefix=%{l_prefix} \
--disable-shared
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
