Update of /cvsroot/monetdb/MonetDB
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13271
Modified Files:
Tag: GDK-2
HowToStart.rst MonetDB.spec.in rpm.mk.in
Log Message:
propagated changes of Tuesday Aug 21 2007 - Friday Aug 24 2007
from the development trunk to the GDK-2 branch
Index: HowToStart.rst
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/HowToStart.rst,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- HowToStart.rst 26 Jan 2007 19:34:06 -0000 1.2
+++ HowToStart.rst 24 Aug 2007 09:01:46 -0000 1.2.4.1
@@ -375,7 +375,7 @@
The disadvantage of running the systems interactively is that you
don't get readline support (if available on your system). A more
pleasant environment can be had by using the system as a server and
-using ``MapiClient`` to interact with the system. For MonetDB4 use::
+using ``mclient`` to interact with the system. For MonetDB4 use::
Mserver --dbinit 'module(mapi); mil_start();'
@@ -404,28 +404,28 @@
mserver5 --dbinit 'include sql;'
-Once the server is running, you can use ``MapiClient`` to interact
-with the server. ``MapiClient`` needs to be told which language you
+Once the server is running, you can use ``mclient`` to interact
+with the server. ``mclient`` needs to be told which language you
want to use, but it does not need to be told whether you're using
MonetDB4 or MonetDB5. In another shell window start::
- MapiClient -l<language>
+ mclient -l<language>
where *language* is one of ``mil``, ``mal``, ``sql``, or ``xquery``.
If no ``-l`` option is given, ``mil`` is the default.
-With ``MapiClient``, you get a text-based interface that supports
+With ``mclient``, you get a text-based interface that supports
command-line editing and a command-line 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.
-At the ``MapiClient`` prompt some extra commands are available. Type
+At the ``mclient`` prompt some extra commands are available. Type
a single question mark to get a list of options. Note that one of the
options is to read input from a file using ``<``. This interferes
with XQuery syntax. This is a known bug.
Index: MonetDB.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/MonetDB.spec.in,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -u -d -r1.52 -r1.52.2.1
--- MonetDB.spec.in 31 Jul 2007 13:41:42 -0000 1.52
+++ MonetDB.spec.in 24 Aug 2007 09:01:48 -0000 1.52.2.1
@@ -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 MonetDB
%define version @VERSION@
-%define release [EMAIL PROTECTED]@[EMAIL PROTECTED]@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
%define prefix /usr
%define sysconfdir /etc
@@ -16,22 +25,16 @@
Packager: Niels Nes <[EMAIL PROTECTED]>
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
BuildRequires: python
+BuildRequires: zlib-devel, bzip2-devel, openssl-devel
%{!?buildsystem: %define buildsystem 0}
-# groups of related archs
-%define all_x86 i386 i586 i686
-
-%ifarch %{all_x86}
-%define bits 32
-%else
-%define bits 64
-%endif
-
%package devel
Summary: MonetDB development package
Group: System
Requires: %{name} = %{version}-%{release}
+Requires: python
+Requires: zlib-devel, bzip2-devel, openssl-devel
%description
MonetDB is a database management system that is developed from a
@@ -53,6 +56,7 @@
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
+ %{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
--prefix=%{prefix} \
--sysconfdir=%{sysconfdir} \
@@ -74,6 +78,7 @@
find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
# cleanup stuff we don't want to install
+rm -r $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT%{prefix}/share/%{name}/Mprofile-commands.lst
rm -rf $RPM_BUILD_ROOT%{prefix}/bin/M*
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/rpm.mk.in,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- rpm.mk.in 26 Jul 2007 14:27:11 -0000 1.19
+++ rpm.mk.in 24 Aug 2007 09:01:51 -0000 1.19.2.1
@@ -37,6 +37,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.spec $(top_builddir)/$(distdir).tar.gz $(rpmtopdir)/rpmmacros
$(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
--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
