Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8323
Modified Files:
Tag: GDK-2
HowToStart-Win32.txt MonetDB-server.spec.in configure.ag
rpm.mk.in vertoo.data
Log Message:
propagated changes of Tuesday Aug 21 2007 - Thursday Aug 23 2007
from the development trunk to the GDK-2 branch
Index: MonetDB-server.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/MonetDB-server.spec.in,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -d -r1.15.2.2 -r1.15.2.3
--- MonetDB-server.spec.in 21 Aug 2007 13:23:43 -0000 1.15.2.2
+++ MonetDB-server.spec.in 23 Aug 2007 13:32:31 -0000 1.15.2.3
@@ -1,6 +1,15 @@
+# groups of related archs
+%define all_x86 i386 i586 i686
+
+%ifarch %{all_x86}
+%define bits 32
+%else
+%define bits 64
+%endif
+
%define name MonetDB5-server
%define version @VERSION@
-%define release [EMAIL PROTECTED]@[EMAIL PROTECTED]@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
%define prefix /usr
%define sysconfdir /etc
@@ -24,15 +33,6 @@
%{!?buildsystem: %define buildsystem 0}
%define builddoc 0
-# groups of related archs
-%define all_x86 i386 i586 i686
-
-%ifarch %{all_x86}
-%define bits 32
-%else
-%define bits 64
-%endif
-
Requires: MonetDB-client >= 1.18
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
@@ -75,6 +75,7 @@
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
+ %{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
--prefix=%{prefix} \
--sysconfdir=%{sysconfdir} \
Index: HowToStart-Win32.txt
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/HowToStart-Win32.txt,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- HowToStart-Win32.txt 6 Feb 2007 23:37:25 -0000 1.2
+++ HowToStart-Win32.txt 23 Aug 2007 13:32:29 -0000 1.2.4.1
@@ -328,25 +328,25 @@
The server console is mainly meant for administrative use, hence there
are no conveniences such as commandline editing or command history.
-For a more convenient MAL interface, you should use the ``MapiClient``
+For a more convenient MAL interface, you should use the ``mclient``
with the Mserver. To do so, first start an Mserver with MAPI (MonetDB5
Application Programmer's Interfaces) support as follows::
Mserver --dbinit="module(mapi); mal_start();"
Then, in a second shell, set up the same environment and start the
-MapiClient::
+mclient::
- MapiClient
+ mclient
-With MapiClient, you get a text-based MAL interface that supports
+With mclient, you get a text-based MAL interface that supports
commandline editing and a commandline history. The latter can even be
stored persistently to be re-used after stopping and restarting
-MapiClient; see
+mclient; see
::
- MapiClient --help
+ mclient --help
for details.
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/vertoo.data,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- vertoo.data 9 Jul 2007 09:46:56 -0000 1.13
+++ vertoo.data 23 Aug 2007 13:32:38 -0000 1.13.2.1
@@ -1,3 +1,3 @@
monetdb = major:1; minor:19; release:0; rc:x; build:1;
monetdb5 = major:5; minor:1; release:0; rc:x; build:1;
-clients = major:1; minor:18; release:0; rc:x; build:1;
+clients = major:1; minor:19; release:0; rc:x; build:1;
\ No newline at end of file
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/configure.ag,v
retrieving revision 1.74
retrieving revision 1.74.2.1
diff -u -d -r1.74 -r1.74.2.1
--- configure.ag 27 Jul 2007 14:27:16 -0000 1.74
+++ configure.ag 23 Aug 2007 13:32:34 -0000 1.74.2.1
@@ -59,7 +59,7 @@
AC_MSG_ERROR([MonetDB5 requires at least version
$req_monetdb_ver of MonetDB, but only version $MONETDBVERS was found.])
fi
fi
-req_clients_ver='1.18.0'
+req_clients_ver='1.19.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -101,6 +101,7 @@
dnl Checks for library functions.
AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
AC_CHECK_FUNCS([asctime_r ctime_r fpclass fpclassify ftime isinf localtime_r
putenv sbrk setenv setsid sigaction strncasecmp strtoll sysconf times])
+AC_CHECK_DECLS([strtoll])
asctime_r3=yes
AC_MSG_CHECKING(asctime_r3)
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/rpm.mk.in,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- rpm.mk.in 26 Jul 2007 14:27:23 -0000 1.7
+++ rpm.mk.in 23 Aug 2007 13:32:35 -0000 1.7.2.1
@@ -46,6 +46,8 @@
echo "%tmpdir %{_tmppath}" >> $(rpmtopdir)/rpmmacros
echo "%rpmcflags -O2 " >> $(rpmtopdir)/rpmmacros
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
+ echo "%dist [EMAIL PROTECTED]@" >>
$(rpmtopdir)/rpmmacros
+ if test "@oids@" -eq 32; then echo "%oid32 1" >>
$(rpmtopdir)/rpmmacros; fi
rpm: MonetDB-server.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
$(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m` ${php}
${perl} ${python} ${java} --define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
