Changeset: 163a4aedba1f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=163a4aedba1f Modified Files: MonetDB/MonetDB.spec MonetDB/NT/Makefile MonetDB/NT/banner.bmp MonetDB/NT/license.rtf MonetDB/NT/monetdb.ico MonetDB/NT/monetdb_config.h.in MonetDB/NT/rules.msc MonetDB/NT/website.html MonetDB/bootstrap MonetDB/conf/Makefile.ag MonetDB/conf/monetdb-config.bat.in MonetDB/conf/monetdb-config.in MonetDB/configure.ag MonetDB/de-bootstrap MonetDB/debian/changelog MonetDB/debian/compat MonetDB/debian/control MonetDB/debian/copyright MonetDB/debian/libmonetdb-dev.install MonetDB/debian/libmonetdb1.install MonetDB/debian/rules MonetDB/rpm.mk.in MonetDB/src/common/dummy_gdk_utils.mx MonetDB/src/common/monet_utils.mx MonetDB/src/common/monetdb-stream.pc.in MonetDB/src/common/stream.mx MonetDB/src/common/stream_socket.h MonetDB/vertoo.config MonetDB/vertoo.data MonetDB4/MonetDB-server.spec MonetDB4/NT/Makefile MonetDB4/NT/monetdb4_config.h.in MonetDB4/NT/rules.msc MonetDB4/bootstrap MonetDB4/conf/Tests/All MonetDB4/conf/Tests/monetdb4-conds.bat MonetDB4/conf/Tests/monetdb4-conds.sh MonetDB4/conf/Tests/monetdb4-conds.stable.err MonetDB4/conf/Tests/monetdb4-conds.stable.out.32bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.64bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.64bit.STATIC MonetDB4/conf/Tests/monetdb4-conds.stable.out.Darwin.64bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.32bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.64bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.RedHat4WS.64bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.SunOS5.11.32bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.SunOS5.11.64bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.Windows.32bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.Windows.64bit MonetDB4/conf/acinclude.m4 MonetDB4/conf/monetdb4-config.bat.in MonetDB4/conf/monetdb4-config.in MonetDB4/configure.ag MonetDB4/de-bootstrap MonetDB4/debian/changelog MonetDB4/debian/compat MonetDB4/debian/control MonetDB4/debian/copyright MonetDB4/debian/libmonetdb4-server-dev.install MonetDB4/debian/libmonetdb4-server4.install MonetDB4/debian/monetdb4-server.dirs MonetDB4/debian/monetdb4-server.install MonetDB4/debian/monetdb4-server.postinst MonetDB4/debian/rules MonetDB4/rpm.mk.in MonetDB4/vertoo.config MonetDB4/vertoo.data MonetDB5/MonetDB-server.spec MonetDB5/NT/Makefile MonetDB5/NT/mal_config.h.in MonetDB5/NT/rules.msc MonetDB5/bootstrap MonetDB5/conf/Tests/All MonetDB5/conf/Tests/monetdb5-conds.bat MonetDB5/conf/Tests/monetdb5-conds.sh MonetDB5/conf/Tests/monetdb5-conds.stable.err MonetDB5/conf/Tests/monetdb5-conds.stable.out.32bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.64bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.Darwin.64bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.Debian4.0.32bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.32bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.64bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.RedHat4WS.64bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.SunOS5.11.32bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.SunOS5.11.64bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.Windows.32bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.Windows.64bit MonetDB5/conf/config.rpath MonetDB5/conf/monetdb5-config.bat.in MonetDB5/conf/monetdb5-config.in MonetDB5/configure.ag MonetDB5/de-bootstrap MonetDB5/debian/changelog MonetDB5/debian/compat MonetDB5/debian/control MonetDB5/debian/copyright MonetDB5/debian/libmonetdb5-server-dev.install MonetDB5/debian/libmonetdb5-server5.install MonetDB5/debian/monetdb5-server.dirs MonetDB5/debian/monetdb5-server.install MonetDB5/debian/monetdb5-server.postinst MonetDB5/debian/rules MonetDB5/rpm.mk.in MonetDB5/src/optimizer/opt_mitosis.mx MonetDB5/vertoo.config MonetDB5/vertoo.data buildtools/Makefile.am buildtools/Makefile.msc buildtools/Mx/AUTHORS buildtools/Mx/COPYING buildtools/Mx/ChangeLog buildtools/Mx/Makefile.am buildtools/Mx/Makefile.msc buildtools/Mx/NEWS buildtools/Mx/README buildtools/Mx/bootstrap buildtools/Mx/configure.ac buildtools/Mx/install.lst buildtools/Mx/winconfig.h buildtools/autogen/Makefile.am buildtools/autogen/install.lst buildtools/bootstrap buildtools/burg/Makefile.am buildtools/burg/Makefile.msc buildtools/burg/bootstrap buildtools/burg/configure.ac buildtools/burg/install.lst buildtools/burg/winconfig.h buildtools/conf/.rpmmacros buildtools/conf/Makefile.am buildtools/conf/Mbootstrap.in buildtools/conf/MonetDB-release-1.1/MonetDB-GPG-KEY buildtools/conf/MonetDB-release-1.1/monetdb.repo buildtools/conf/MonetDB-release.spec buildtools/conf/buildtools-config.in buildtools/conf/configure.py buildtools/conf/install.lst buildtools/conf/mock/fedora-12-i386-monetdb.cfg buildtools/conf/mock/fedora-12-x86_64-monetdb.cfg buildtools/conf/winconfig.h buildtools/conf/winrules.msc buildtools/configure.ac buildtools/de-bootstrap buildtools/mel/AUTHORS buildtools/mel/COPYING buildtools/mel/ChangeLog buildtools/mel/FileInfo.mx buildtools/mel/ListIterator.mx buildtools/mel/Makefile.am buildtools/mel/Makefile.msc buildtools/mel/NEWS buildtools/mel/README buildtools/mel/any_arg.mx buildtools/mel/atom.mx buildtools/mel/atom_arg.mx buildtools/mel/atomops.mx buildtools/mel/bat_arg.mx buildtools/mel/bootstrap buildtools/mel/builtin.mx buildtools/mel/command.mx buildtools/mel/configure.ac buildtools/mel/debug.mx buildtools/mel/depend.mx buildtools/mel/dependency.mx buildtools/mel/epilogue.mx buildtools/mel/glue.mx buildtools/mel/html.mx buildtools/mel/install.lst buildtools/mel/iterator.mx buildtools/mel/language.mx buildtools/mel/link.mx buildtools/mel/list.mx buildtools/mel/mel.mx buildtools/mel/mil.mx buildtools/mel/module.mx buildtools/mel/object.mx buildtools/mel/operator.mx buildtools/mel/ops.mx buildtools/mel/prelude.mx buildtools/mel/proto.mx buildtools/mel/rules.mk buildtools/mel/symbol.mx buildtools/mel/symtable.mx buildtools/mel/type_arg.mx buildtools/mel/use.mx buildtools/mel/var_arg.mx buildtools/mel/winconfig.h buildtools/vertoo.config buildtools/vertoo.data clients/MonetDB-client.spec clients/NT/Makefile clients/NT/clients_config.h.in clients/NT/rules.msc clients/bootstrap clients/conf/Makefile.ag clients/conf/Tests/All clients/conf/Tests/monetdb-clients-conds.bat clients/conf/Tests/monetdb-clients-conds.sh clients/conf/Tests/monetdb-clients-conds.stable.err clients/conf/Tests/monetdb-clients-conds.stable.out.32bit clients/conf/Tests/monetdb-clients-conds.stable.out.64bit clients/conf/Tests/monetdb-clients-conds.stable.out.64bit.STATIC clients/conf/Tests/monetdb-clients-conds.stable.out.Debian4.0.32bit clients/conf/Tests/monetdb-clients-conds.stable.out.Fedora12.32bit clients/conf/Tests/monetdb-clients-conds.stable.out.Fedora12.64bit clients/conf/Tests/monetdb-clients-conds.stable.out.RedHat4WS.64bit clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.32bit clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.64bit clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.32bit clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.64bit clients/conf/Tests/monetdb-conds.bat clients/conf/Tests/monetdb-conds.sh clients/conf/Tests/monetdb-conds.stable.err clients/conf/Tests/monetdb-conds.stable.out.32bit clients/conf/Tests/monetdb-conds.stable.out.64bit clients/conf/Tests/monetdb-conds.stable.out.64bit.STATIC clients/conf/Tests/monetdb-conds.stable.out.Darwin.64bit clients/conf/Tests/monetdb-conds.stable.out.Fedora12.32bit clients/conf/Tests/monetdb-conds.stable.out.Fedora12.64bit clients/conf/Tests/monetdb-conds.stable.out.RedHat4WS.64bit clients/conf/Tests/monetdb-conds.stable.out.SunOS5.11.32bit clients/conf/Tests/monetdb-conds.stable.out.SunOS5.11.64bit clients/conf/Tests/monetdb-conds.stable.out.Windows.32bit clients/conf/Tests/monetdb-conds.stable.out.Windows.64bit clients/conf/Tests/monetdb-testing-conds.bat clients/conf/Tests/monetdb-testing-conds.sh clients/conf/Tests/monetdb-testing-conds.stable.err clients/conf/Tests/monetdb-testing-conds.stable.out.32bit clients/conf/Tests/monetdb-testing-conds.stable.out.64bit clients/conf/Tests/monetdb-testing-conds.stable.out.64bit.STATIC clients/conf/Tests/monetdb-testing-conds.stable.out.Darwin.64bit clients/conf/Tests/monetdb-testing-conds.stable.out.Fedora12.32bit clients/conf/Tests/monetdb-testing-conds.stable.out.Fedora12.64bit clients/conf/Tests/monetdb-testing-conds.stable.out.RedHat4WS.64bit clients/conf/Tests/monetdb-testing-conds.stable.out.SunOS5.11.32bit clients/conf/Tests/monetdb-testing-conds.stable.out.SunOS5.11.64bit clients/conf/Tests/monetdb-testing-conds.stable.out.Windows.32bit clients/conf/Tests/monetdb-testing-conds.stable.out.Windows.64bit clients/conf/config.rpath clients/conf/monetdb-clients-config.bat.in clients/conf/monetdb-clients-config.in clients/configure.ag clients/de-bootstrap clients/debian/changelog clients/debian/compat clients/debian/control clients/debian/copyright clients/debian/libmonetdb-client-dev.install clients/debian/libmonetdb-client-odbc-dev.install clients/debian/libmonetdb-client-odbc1.install clients/debian/libmonetdb-client-perl.install clients/debian/libmonetdb-client1.install clients/debian/monetdb-client-testing.install clients/debian/monetdb-client.install clients/debian/php5-monetdb-client.install clients/debian/ruby-monetdb-client.install clients/debian/rules clients/rpm.mk.in clients/vertoo.config clients/vertoo.data geom/MonetDB-geom.spec geom/NT/Makefile geom/NT/geom_config.h.in geom/NT/rules.msc geom/bootstrap geom/conf/Makefile.ag geom/conf/Tests/All geom/conf/Tests/monetdb-geom-conds.bat geom/conf/Tests/monetdb-geom-conds.sh geom/conf/Tests/monetdb-geom-conds.stable.err geom/conf/Tests/monetdb-geom-conds.stable.out.32bit geom/conf/Tests/monetdb-geom-conds.stable.out.64bit geom/conf/Tests/monetdb-geom-conds.stable.out.Darwin.64bit geom/conf/Tests/monetdb-geom-conds.stable.out.Debian4.0.32bit geom/conf/Tests/monetdb-geom-conds.stable.out.Fedora12.32bit geom/conf/Tests/monetdb-geom-conds.stable.out.Fedora12.64bit geom/conf/Tests/monetdb-geom-conds.stable.out.RedHat4WS.64bit geom/conf/Tests/monetdb-geom-conds.stable.out.SunOS5.11.32bit geom/conf/Tests/monetdb-geom-conds.stable.out.SunOS5.11.64bit geom/conf/Tests/monetdb-geom-conds.stable.out.Windows.32bit geom/conf/Tests/monetdb-geom-conds.stable.out.Windows.64bit geom/conf/monetdb-geom-config.bat.in geom/conf/monetdb-geom-config.in geom/configure.ag geom/de-bootstrap geom/debian/changelog geom/debian/compat geom/debian/control geom/debian/copyright geom/debian/libmonetdb4-server-geom0.install geom/debian/libmonetdb4-server-geom0.postinst.debhelper geom/debian/libmonetdb4-server-geom0.postrm.debhelper geom/debian/libmonetdb4-server-geom0.substvars geom/debian/libmonetdb5-server-geom0.install geom/debian/libmonetdb5-server-geom0.postinst.debhelper geom/debian/libmonetdb5-server-geom0.postrm.debhelper geom/debian/libmonetdb5-server-geom0.substvars geom/debian/monetdb-geom-dev.install geom/debian/monetdb-geom.install geom/debian/rules geom/rpm.mk.in geom/vertoo.config geom/vertoo.data java/NT/Makefile java/NT/rules.msc java/bootstrap java/conf/Makefile.ag java/de-bootstrap java/rpm.mk.in java/vertoo.config java/vertoo.data pathfinder/MonetDB-XQuery.spec pathfinder/NT/Makefile pathfinder/NT/pf_config.h.in pathfinder/NT/rules.msc pathfinder/bootstrap pathfinder/conf/Makefile.ag pathfinder/conf/Tests/All pathfinder/conf/Tests/monetdb-xquery-conds.bat pathfinder/conf/Tests/monetdb-xquery-conds.sh pathfinder/conf/Tests/monetdb-xquery-conds.stable.err pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.32bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.64bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.64bit.STATIC pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Darwin.64bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Debian4.0.32bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Fedora12.32bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Fedora12.64bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.RedHat4WS.64bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.SunOS5.11.32bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.SunOS5.11.64bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.32bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.64bit pathfinder/conf/monetdb-xquery-config.bat.in pathfinder/conf/monetdb-xquery-config.in pathfinder/configure.ag pathfinder/de-bootstrap pathfinder/debian/changelog pathfinder/debian/compat pathfinder/debian/control pathfinder/debian/copyright pathfinder/debian/libmonetdb4-xquery-dev.install pathfinder/debian/libmonetdb4-xquery0.install pathfinder/debian/libpf-ferry0.install pathfinder/debian/monetdb-xquery.install pathfinder/debian/rules pathfinder/extra.mk.in pathfinder/rpm.mk.in pathfinder/vertoo.config pathfinder/vertoo.data python/MANIFEST python/debian/compat python/debian/copyright sql/MonetDB-SQL.spec sql/NT/Makefile sql/NT/rules.msc sql/NT/sql_config.h.in sql/bootstrap sql/conf/Makefile.ag sql/conf/Tests/All sql/conf/Tests/monetdb-sql-conds.bat sql/conf/Tests/monetdb-sql-conds.sh sql/conf/Tests/monetdb-sql-conds.stable.err sql/conf/Tests/monetdb-sql-conds.stable.out.32bit sql/conf/Tests/monetdb-sql-conds.stable.out.64bit sql/conf/Tests/monetdb-sql-conds.stable.out.Darwin.64bit sql/conf/Tests/monetdb-sql-conds.stable.out.Debian4.0.32bit sql/conf/Tests/monetdb-sql-conds.stable.out.Fedora12.32bit sql/conf/Tests/monetdb-sql-conds.stable.out.Fedora12.64bit sql/conf/Tests/monetdb-sql-conds.stable.out.RedHat4WS.64bit sql/conf/Tests/monetdb-sql-conds.stable.out.SunOS5.11.32bit sql/conf/Tests/monetdb-sql-conds.stable.out.SunOS5.11.64bit sql/conf/Tests/monetdb-sql-conds.stable.out.Windows.32bit sql/conf/Tests/monetdb-sql-conds.stable.out.Windows.64bit sql/conf/monetdb-sql-config.bat.in sql/conf/monetdb-sql-config.in sql/configure.ag sql/de-bootstrap sql/debian/changelog sql/debian/compat sql/debian/control sql/debian/copyright sql/debian/libmonetdb5-sql-dev.install sql/debian/libmonetdb5-sql2.install sql/debian/monetdb5-sql.default sql/debian/monetdb5-sql.dirs sql/debian/monetdb5-sql.init.d sql/debian/monetdb5-sql.install sql/debian/monetdb5-sql.postinst sql/debian/rules sql/rpm.mk.in sql/src/backends/monet5/merovingian/client/Makefile.ag sql/src/backends/monet5/merovingian/daemon/Makefile.ag sql/src/backends/monet5/merovingian/utils/Makefile.ag sql/src/backends/monet5/vaults/vault.sql sql/src/server/rel_schema.c sql/src/server/rel_semantic.c sql/src/server/sql_parser.h sql/src/server/sql_parser.y sql/src/server/sql_scan.c sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql sql/src/test/Tests/copy_into.sql sql/src/test/Tests/load_dec_as_int.sql.src sql/src/test/Tests/load_dec_as_int.stable.err sql/src/test/Tests/load_dec_as_int.stable.out sql/vertoo.config sql/vertoo.data template/conf/Tests/monetdb-template-conds.stable.out.Darwin.64bit template/conf/Tests/monetdb-template-conds.stable.out.Fedora12.32bit template/conf/Tests/monetdb-template-conds.stable.out.Fedora12.64bit template/conf/Tests/monetdb-template-conds.stable.out.RedHat4WS.64bit template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.64bit template/vertoo.config template/vertoo.data testing/MonetDB-testing.spec testing/NT/Makefile testing/NT/rules.msc testing/NT/testing_config.h.in testing/bootstrap testing/conf/Makefile.ag testing/conf/monetdb-testing-config.bat.in testing/conf/monetdb-testing-config.in testing/configure.ag testing/de-bootstrap testing/debian/changelog testing/debian/compat testing/debian/control testing/debian/copyright testing/debian/rules testing/rpm.mk.in testing/vertoo.config testing/vertoo.data Branch: sciql Log Message:
merge from default diffs (truncated from 114696 to 300 lines): diff -r e4eea452ae77 -r 163a4aedba1f .hgignore --- a/.hgignore Sat Nov 27 11:01:13 2010 +0100 +++ b/.hgignore Fri Jan 14 12:30:19 2011 +0100 @@ -2,10 +2,12 @@ /\.\# /@ ~$ +configure.ac MANIFEST$ Makefile\.in$ +Makefile\.am +Makefile\.msc MonetDB4/NT/MonetDB\.pc$ -NT/.*_config\.h$ NT/RunMapprove\.bat$ NT/RunMserver\.bat$ NT/RunMtest\.bat$ @@ -27,13 +29,21 @@ ^(?!buildtools).*/Makefile\.msc$ ^TestTools/ ^buildtools/Mx/depcomp$ -^buildtools/Mx/mx_config\.h$ ^buildtools/autogen/build/ -^buildtools/burg/burg_config\.h$ ^buildtools/burg/depcomp$ ^buildtools/burg/gram\.[ch]$ ^buildtools/burg/y\.tab\.h$ ^buildtools/burg/ylwrap$ +^buildtools/conf/config\.guess$ +^buildtools/conf/config\.sub$ +^buildtools/conf/install-sh$ +^buildtools/conf/missing$ +^buildtools/conf/libtool\.m4$ +^buildtools/conf/ltoptions\.m4$ +^buildtools/conf/ltsugar\.m4$ +^buildtools/conf/ltversion\.m4$ +^buildtools/conf/lt~obsolete\.m4$ +^buildtools/conf/ylwrap$ ^buildtools/depcomp$ ^buildtools/doc/HowToRelease\.html$ ^buildtools/doc/HowToRelease\.pdf$ @@ -52,24 +62,20 @@ ^java/NT/tests/ ^java/build/ ^java/jars/ +^monetdb_config\.h\.in$ ^pathfinder/NT/compiler/ ^pathfinder/NT/modules/ ^pathfinder/NT/runtime/ ^pathfinder/conf/compile$ ^python/build/ ^python/dist/ +^python/MANIFEST$ ^sql/NT/MonetDB-SQL\.pc$ aclocal\.m4$ acout\.in$ autom4te\.cache$ callant.*\.bat$ -config\.guess$ -config\.h\.in$ -config\.sub$ configure$ -configure\.in$ doc\.lst$ -install-sh$ install\.lst$ ltmain\.sh$ -missing$ diff -r e4eea452ae77 -r 163a4aedba1f .hgtags --- a/.hgtags Sat Nov 27 11:01:13 2010 +0100 +++ b/.hgtags Fri Jan 14 12:30:19 2011 +0100 @@ -432,3 +432,4 @@ 49a13817f9ce7c7d75476f9cb37ab29b9a30a9c8 Oct2010_1 49a13817f9ce7c7d75476f9cb37ab29b9a30a9c8 Oct2010_1 491925a23d21d3599a5680618f4f00f8b8710c78 Oct2010_1 +be8749b7640878f829575ef9daa995810d6fe25d Oct2010_3 diff -r e4eea452ae77 -r 163a4aedba1f Makefile.ag --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Makefile.ag Fri Jan 14 12:30:19 2011 +0100 @@ -0,0 +1,30 @@ +# The contents of this file are subject to the MonetDB Public License +# Version 1.1 (the "License"); you may not use this file except in +# compliance with the License. You may obtain a copy of the License at +# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# +# Software distributed under the License is distributed on an "AS IS" +# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +# License for the specific language governing rights and limitations +# under the License. +# +# The Original Code is the MonetDB Database System. +# +# The Initial Developer of the Original Code is CWI. +# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +# Copyright August 2008-2011 MonetDB B.V. +# All Rights Reserved. + +SUBDIRS = buildtools common MonetDB clients \ + HAVE_MONETDB4?MonetDB4 \ + HAVE_MONETDB5?MonetDB5 \ + HAVE_SQL?sql \ + HAVE_GEOM?geom \ + HAVE_PATHFINDER?pathfinder \ + HAVE_JAVA?java \ + HAVE_TESTING?testing \ + HAVE_PYTHON?python + +EXTRA_DIST = bootstrap configure configure.ac configure.ag MonetDB.spec rpm.mk.in + +EXTRA_DIST_DIR = NT debian template diff -r e4eea452ae77 -r 163a4aedba1f MonetDB.spec --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB.spec Fri Jan 14 12:30:19 2011 +0100 @@ -0,0 +1,680 @@ +%define name MonetDB +%define version 11.0.0 +%{!?buildno: %define buildno %(date +%Y%m%d)} +%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}} + +# groups of related archs +%define all_x86 i386 i586 i686 + +%ifarch %{all_x86} +%define bits 32 +%else +%define bits 64 +%endif + +# by default we do not build the netcdf package +%{!?_with_netcdf: %{!?_without_netcdf: %define _without_netcdf --without-netcdf}} + +Name: %{name} +Version: %{version} +Release: %{release} +Summary: MonetDB - Monet Database Management System +Vendor: MonetDB BV <[email protected]> + +Group: Applications/Databases +License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +URL: http://monetdb.cwi.nl/ +Source: http://dev.monetdb.org/downloads/sources/Oct2010/%{name}-%{version}.tar.gz + +BuildRequires: bzip2-devel +BuildRequires: geos-devel >= 2.2.0 +BuildRequires: libxml2-devel +BuildRequires: openssl-devel >= 0.9.8f +BuildRequires: pcre-devel >= 4.5 +BuildRequires: perl +BuildRequires: perl-devel +BuildRequires: python +BuildRequires: raptor-devel >= 1.4.16 +BuildRequires: readline-devel +BuildRequires: ruby +BuildRequires: rubygems +BuildRequires: swig +BuildRequires: unixODBC-devel +BuildRequires: zlib-devel + +%define perl_libdir %(perl -MConfig -e '$x=$Config{installvendorarch}; $x =~ s|$Config{vendorprefix}/||; print $x;') +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif +%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')} +%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) + +%description +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators, SQL- and XML- frontends. + +This package contains the core components of MonetDB. If you want to +use MonetDB, you will certainly need this package. + +%package devel +Summary: MonetDB development package +Group: Applications/Databases +Obsoletes: MonetDB-client-devel +Obsoletes: MonetDB-geom-devel +Obsoletes: MonetDB4-server-devel +Obsoletes: MonetDB5-server-devel +Obsoletes: MonetDB4-XQuery-devel +Obsoletes: MonetDB-SQL-devel +Requires: %{name} = %{version}-%{release} +Requires: %{name}-clients = %{version}-%{release} +Requires: %{name}-clients-odbc = %{version}-%{release} +Requires: %{name}-geom-MonetDB4 = %{version}-%{release} +Requires: %{name}-geom-MonetDB5 = %{version}-%{release} +Requires: MonetDB4-server = %{version}-%{release} +%if %{?_with_netcdf:1}%{!?_with_netcdf:0} +Requires: MonetDB4-server-netcdf = %{version}-%{release} +%endif +Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server-rdf = %{version}-%{release} +Requires: %{name}-SQL-server5 = %{version}-%{release} +Requires: MonetDB4-XQuery = %{version}-%{release} +Requires: MonetDB4-XQuery-ferry = %{version}-%{release} + +Requires: bzip2-devel +Requires: geos-devel >= 2.2.0 +Requires: libxml2-devel +%if %{?_with_netcdf:1}%{!?_with_netcdf:0} +Requires: netcdf-devel +%endif +Requires: openssl-devel >= 0.9.8f +Requires: pcre-devel >= 4.5 +Requires: perl +Requires: perl-devel +Requires: python +Requires: raptor-devel >= 1.4.16 +Requires: readline-devel +Requires: ruby +Requires: rubygems +Requires: swig +Requires: unixODBC-devel +Requires: zlib-devel + +%description devel +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators, SQL- and XML- frontends. + +This package contains the files needed to develop with MonetDB. + +%package client +Summary: MonetDB - Monet Database Management System Client Programs +Group: Applications/Databases +Requires: %{name} = %{version}-%{release} + +%description client +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators, SQL- and XML- frontends. + +This package contains mclient, the main client program to communicate +with the database server, and msqldump, a program to dump the SQL +database so that it can be loaded back later. If you want to use +MonetDB, you will very likely need this package. + +%package client-odbc +Summary: MonetDB SQL odbc +Group: Applications/Databases +Requires: %{name}-client = %{version}-%{release} + +%description client-odbc +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators, SQL- and XML- frontends. + +This package contains the MonetDB ODBC driver. + +%package client-php +Summary: MonetDB php interface +Group: Applications/Databases +Requires: php +BuildArch: noarch + +%description client-php +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators, SQL- and XML- frontends. + +This package contains the files needed to use MonetDB from a PHP +program. + +%package client-perl +Summary: MonetDB perl interface +Group: Applications/Databases +Requires: %{name}-client = %{version}-%{release} +Requires: perl + +%description client-perl +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators, SQL- and XML- frontends. + +This package contains the files needed to use MonetDB from a Perl +program. + +%package client-ruby +Summary: MonetDB ruby interface +Group: Applications/Databases +Requires: ruby(abi) = 1.8 +BuildArch: noarch + +%description client-ruby +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators, SQL- and XML- frontends. + +This package contains the files needed to use MonetDB from a Ruby +program. + +%package client-tests _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
