Changeset: a130af050559 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a130af050559
Added Files:
        clients/R/Tests/copy_into_fwf.R
        clients/R/Tests/copy_into_fwf.reqtests
        clients/R/Tests/copy_into_fwf.stable.err
        clients/R/Tests/copy_into_fwf.stable.out
        debian/libmonetdb-client8.install
        debian/libmonetdb-stream8.install
        debian/libmonetdb13.install
        monetdb5/extras/rapi/Tests/rapi10.malC
        monetdb5/extras/rapi/Tests/rapi10.stable.err
        monetdb5/extras/rapi/Tests/rapi10.stable.out
        sql/backends/monet5/Tests/pyapi29.sql
        sql/backends/monet5/Tests/pyapi29.stable.err
        sql/backends/monet5/Tests/pyapi29.stable.out
        sql/backends/monet5/Tests/pyapi30.sql
        sql/backends/monet5/Tests/pyapi30.stable.err
        sql/backends/monet5/Tests/pyapi30.stable.out
        sql/backends/monet5/Tests/rapi20.sql
        sql/backends/monet5/Tests/rapi20.stable.err
        sql/backends/monet5/Tests/rapi20.stable.out
        sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.timeout
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32
Removed Files:
        buildtools/ChangeLog.Jul2015
        clients/ChangeLog.Jul2015
        clients/mapilib/ChangeLog.Jul2015
        clients/python2/ChangeLog
        clients/python2/ChangeLog-Archive
        clients/python2/ChangeLog.Jul2015
        clients/python2/ChangeLog.Jun2016
        clients/python2/MANIFEST.in
        clients/python2/Makefile.ag
        clients/python2/README.rst
        clients/python2/monetdb/__init__.py
        clients/python2/monetdb/control.py
        clients/python2/monetdb/exceptions.py
        clients/python2/monetdb/mapi.py
        clients/python2/monetdb/sql/__init__.py
        clients/python2/monetdb/sql/connections.py
        clients/python2/monetdb/sql/converters.py
        clients/python2/monetdb/sql/cursors.py
        clients/python2/monetdb/sql/monetize.py
        clients/python2/monetdb/sql/pythonize.py
        clients/python2/monetdb/sql/types.py
        clients/python2/setup.py
        clients/python2/test/capabilities.py
        clients/python2/test/dbapi20.py
        clients/python2/test/run.cmd
        clients/python2/test/run.sh
        clients/python2/test/runtests.py
        clients/python2/test/test_control.py
        clients/python2/test/test_monetize.py
        clients/python2/test/test_pythonize.py
        clients/python3/ChangeLog
        clients/python3/ChangeLog-Archive
        clients/python3/ChangeLog.Jul2015
        clients/python3/ChangeLog.Jun2016
        clients/python3/MANIFEST.in
        clients/python3/Makefile.ag
        clients/python3/README.rst
        clients/python3/monetdb/__init__.py
        clients/python3/monetdb/control.py
        clients/python3/monetdb/exceptions.py
        clients/python3/monetdb/mapi.py
        clients/python3/monetdb/sql/__init__.py
        clients/python3/monetdb/sql/connections.py
        clients/python3/monetdb/sql/converters.py
        clients/python3/monetdb/sql/cursors.py
        clients/python3/monetdb/sql/monetize.py
        clients/python3/monetdb/sql/pythonize.py
        clients/python3/monetdb/sql/types.py
        clients/python3/setup.py
        clients/python3/test/capabilities.py
        clients/python3/test/dbapi20.py
        clients/python3/test/run.cmd
        clients/python3/test/run.sh
        clients/python3/test/runtests.py
        clients/python3/test/test_control.py
        clients/python3/test/test_monetize.py
        clients/python3/test/test_pythonize.py
        common/stream/ChangeLog.Jul2015
        debian/libmonetdb-client7.install
        debian/libmonetdb-stream7.install
        debian/libmonetdb12.install
        gdk/ChangeLog.Jul2015
        geom/ChangeLog.Jul2015
        java/ChangeLog.Jul2015
        monetdb5/ChangeLog.Jul2015
        monetdb5/optimizer/opt_qep.c
        monetdb5/optimizer/opt_qep.h
        monetdb5/tests/BugReports/Tests/no.146.stable.out
        sql/ChangeLog.Jul2015
        sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.bat
        sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.sh
        sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
        sql/test/mapi/Tests/python2_test_monetdb_sql.stable.out
        sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.bat
        sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.sh
        sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
        sql/test/mapi/Tests/python3_test_monetdb_sql.stable.out
        testing/ChangeLog.Jul2015
        tools/merovingian/ChangeLog.Jul2015
Modified Files:
        .hgtags
        MonetDB.spec
        NT/Makefile
        NT/installer32/MonetDB-ODBC-Installer.vdproj
        NT/installer32/MonetDB5-Geom-Module.vdproj
        NT/installer32/MonetDB5-SQL-Installer.vdproj
        NT/installer64/MonetDB-ODBC-Installer.vdproj
        NT/installer64/MonetDB5-Geom-Module.vdproj
        NT/installer64/MonetDB5-SQL-Installer.vdproj
        NT/monetdb_config.h.in
        NT/rules.msc
        buildtools/ChangeLog-Archive
        buildtools/ChangeLog.Jun2016
        buildtools/autogen/autogen/am.py
        buildtools/autogen/autogen/msc.py
        buildtools/doc/windowsbuild.rst
        clients/ChangeLog-Archive
        clients/ChangeLog.Jun2016
        clients/Makefile.ag
        clients/R/Tests/All
        clients/R/Tests/dbi.R
        clients/R/Tests/dbi.stable.out
        clients/R/Tests/deps-test.R
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/SQL-dump.stable.out
        clients/Tests/SQL-dump.stable.out.int128
        clients/Tests/exports.stable.out
        clients/Tests/malcheck.sh
        clients/examples/python/basics.py
        clients/examples/python/mclient-python2.py
        clients/examples/python/mclient-python3.py
        clients/examples/python/perf.py
        clients/examples/python/sqlsample.py
        clients/mapiclient/mclient.c
        clients/mapiclient/msqldump.c
        clients/mapilib/mapi.rc
        clients/odbc/driver/ODBCConvert.c
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        common/stream/stream.c
        common/stream/stream.h
        common/utils/msabaoth.c
        configure.ag
        debian/changelog
        debian/control
        debian/fix-deb.sh
        debian/monetdb-r.install
        debian/monetdb5-sql.install
        debian/rules
        gdk/ChangeLog-Archive
        gdk/ChangeLog.Jun2016
        gdk/gdk.h
        gdk/gdk_bbp.c
        gdk/gdk_logger.c
        gdk/gdk_posix.c
        gdk/gdk_storage.c
        gdk/gdk_system.c
        gdk/gdk_utils.c
        gdk/libbat.rc
        geom/ChangeLog-Archive
        geom/ChangeLog.Jun2016
        geom/lib/libgeom.c
        geom/monetdb5/geom.c
        geom/sql/Makefile.ag
        java/ChangeLog-Archive
        java/ChangeLog.Jun2016
        java/Makefile.ag
        java/build.properties
        java/pom.xml
        java/release.txt
        java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
        java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
        java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
        java/tests/Test_Dobjects.java
        libversions
        monetdb5/ChangeLog-Archive
        monetdb5/ChangeLog.Jun2016
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
        monetdb5/extras/pyapi/connection.c
        monetdb5/extras/pyapi/connection.h
        monetdb5/extras/pyapi/pyapi.c
        monetdb5/extras/pyapi/pyapi.h
        monetdb5/extras/rapi/Makefile.ag
        monetdb5/extras/rapi/Tests/All
        monetdb5/extras/rapi/converters.c.h
        monetdb5/extras/rapi/rapi.R
        monetdb5/extras/rapi/rapi.c
        monetdb5/extras/rapi/rapi.h
        monetdb5/mal/Tests/tst010.stable.err
        monetdb5/mal/mal.c
        monetdb5/mal/mal.h
        monetdb5/mal/mal_builder.c
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_dataflow.c
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_debugger.h
        monetdb5/mal/mal_factory.c
        monetdb5/mal/mal_function.c
        monetdb5/mal/mal_function.h
        monetdb5/mal/mal_import.c
        monetdb5/mal/mal_instruction.c
        monetdb5/mal/mal_instruction.h
        monetdb5/mal/mal_interpreter.c
        monetdb5/mal/mal_listing.c
        monetdb5/mal/mal_parser.c
        monetdb5/mal/mal_profiler.c
        monetdb5/mal/mal_recycle.c
        monetdb5/mal/mal_resolve.c
        monetdb5/mal/mal_resource.c
        monetdb5/mal/mal_resource.h
        monetdb5/mal/mal_runtime.c
        monetdb5/modules/atoms/json.c
        monetdb5/modules/atoms/str.c
        monetdb5/modules/atoms/url.c
        monetdb5/modules/kernel/batstr.c
        monetdb5/modules/mal/batExtensions.c
        monetdb5/modules/mal/batExtensions.h
        monetdb5/modules/mal/groupby.c
        monetdb5/modules/mal/inspect.c
        monetdb5/modules/mal/mal_io.c
        monetdb5/modules/mal/mdb.c
        monetdb5/modules/mal/mdb.h
        monetdb5/modules/mal/mdb.mal
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/sysmon.c
        monetdb5/modules/mal/tablet.c
        monetdb5/modules/mal/tokenizer.c
        monetdb5/optimizer/Makefile.ag
        monetdb5/optimizer/Tests/dataflow3.stable.out
        monetdb5/optimizer/Tests/inline02.stable.out
        monetdb5/optimizer/Tests/inline03.stable.out
        monetdb5/optimizer/Tests/inline04.stable.out
        monetdb5/optimizer/Tests/inline06.stable.out
        monetdb5/optimizer/opt_aliases.c
        monetdb5/optimizer/opt_candidates.c
        monetdb5/optimizer/opt_coercion.c
        monetdb5/optimizer/opt_commonTerms.c
        monetdb5/optimizer/opt_constants.c
        monetdb5/optimizer/opt_costModel.c
        monetdb5/optimizer/opt_dataflow.c
        monetdb5/optimizer/opt_deadcode.c
        monetdb5/optimizer/opt_evaluate.c
        monetdb5/optimizer/opt_factorize.c
        monetdb5/optimizer/opt_garbageCollector.c
        monetdb5/optimizer/opt_generator.c
        monetdb5/optimizer/opt_inline.c
        monetdb5/optimizer/opt_json.c
        monetdb5/optimizer/opt_macro.c
        monetdb5/optimizer/opt_matpack.c
        monetdb5/optimizer/opt_mergetable.c
        monetdb5/optimizer/opt_mitosis.c
        monetdb5/optimizer/opt_multiplex.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_profiler.c
        monetdb5/optimizer/opt_projectionpath.c
        monetdb5/optimizer/opt_pushselect.c
        monetdb5/optimizer/opt_querylog.c
        monetdb5/optimizer/opt_recycler.c
        monetdb5/optimizer/opt_reduce.c
        monetdb5/optimizer/opt_remap.c
        monetdb5/optimizer/opt_remoteQueries.c
        monetdb5/optimizer/opt_reorder.c
        monetdb5/optimizer/opt_support.c
        monetdb5/optimizer/opt_volcano.c
        monetdb5/optimizer/opt_wrapper.c
        monetdb5/optimizer/optimizer.c
        monetdb5/optimizer/optimizer.mal
        monetdb5/optimizer/optimizer_private.h
        monetdb5/tools/libmonetdb5.rc
        sql/ChangeLog-Archive
        sql/ChangeLog.Jun2016
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/Tests/All
        sql/backends/monet5/UDF/README
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql_cast.c
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_round_impl.h
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_upgrades.c
        sql/backends/monet5/sql_user.c
        sql/backends/monet5/vaults/bam/bam_lib.c
        sql/benchmarks/tpch/fileleak/Tests/All
        sql/benchmarks/tpch/fileleak/Tests/delete_all.SQL.py
        sql/benchmarks/tpch/fileleak/Tests/leaks.SQL.py
        sql/common/sql_list.c
        sql/common/sql_types.c
        sql/include/sql_list.h
        sql/jdbc/tests/Tests/Test_Dobjects.stable.out
        sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
        sql/scripts/51_sys_schema_extension.sql
        sql/server/rel_dump.c
        sql/server/rel_optimizer.c
        sql/server/rel_partition.c
        sql/server/rel_partition.h
        sql/server/rel_prop.c
        sql/server/rel_psm.c
        sql/server/rel_select.c
        sql/server/rel_select.h
        sql/server/rel_semantic.c
        sql/server/rel_updates.c
        sql/server/sql_atom.c
        sql/server/sql_mvc.c
        sql/server/sql_parser.y
        sql/server/sql_scan.c
        sql/storage/bat/bat_logger.c
        sql/storage/bat/bat_storage.c
        
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
        sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
        sql/test/BugTracker-2011/Tests/All
        sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py
        sql/test/BugTracker-2013/Tests/All
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
        sql/test/BugTracker-2013/Tests/python-explain.Bug-3380.SQL.py
        sql/test/BugTracker-2014/Tests/All
        sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
        sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
        sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
        sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
        sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
        sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
        sql/test/BugTracker-2015/Tests/All
        sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
        sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.SQL.py
        sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.err
        sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.out
        sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
        sql/test/BugTracker-2016/Tests/All
        sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.err
        sql/test/BugTracker/Tests/All
        sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        sql/test/BugTracker/Tests/python_escape.SF-1916844.SQL.py
        sql/test/Tests/systemfunctions.stable.out
        sql/test/Tests/systemfunctions.stable.out.int128
        sql/test/Users/Tests/All
        sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py
        sql/test/concurrent/Tests/All
        sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
        sql/test/concurrent/Tests/simple_select.SQL.py
        sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade/Tests/check.stable.out
        sql/test/emptydb-upgrade/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/emptydb/Tests/check.stable.out
        sql/test/emptydb/Tests/check.stable.out.int128
        sql/test/leaks/Tests/check1.stable.out
        sql/test/leaks/Tests/check1.stable.out.int128
        sql/test/leaks/Tests/check2.stable.out
        sql/test/leaks/Tests/check2.stable.out.int128
        sql/test/leaks/Tests/check3.stable.out
        sql/test/leaks/Tests/check3.stable.out.int128
        sql/test/leaks/Tests/check4.stable.out
        sql/test/leaks/Tests/check4.stable.out.int128
        sql/test/leaks/Tests/check5.stable.out
        sql/test/leaks/Tests/check5.stable.out.int128
        sql/test/mapi/Tests/All
        sql/test/mapi/Tests/python_dec38.py
        sql/test/mapi/Tests/python_int128.py
        sql/test/mergetables/Tests/mergequery.stable.out
        sql/test/pg_regress/Tests/All
        sql/test/remote/Tests/All
        sql/test/remote/Tests/partition_elim.stable.out
        sql/test/remote/Tests/ssbm.SQL.py
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-hge/Tests/dump.stable.out
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/dump.stable.out
        sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
        testing/Mtest.py.in
        tools/mserver/monet_version.c.in
        tools/mserver/mserver5.c
        vertoo.data
Branch: sfcgal
Log Message:

Merge with default


diffs (truncated from 165425 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -622,3 +622,8 @@ ee54e50fccb17db48bbfd983882e8491a869131c
 ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_SP3_release
 51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_19
 51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_SP4_release
+192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_1
+192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_release
+b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_3
+192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_release
+b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,6 +9,7 @@
 %define bits 32
 %else
 %define bits 64
+%define with_int128 1
 %endif
 
 # only add .oidXX suffix if oid size differs from bit size
@@ -100,6 +101,15 @@
 %endif
 %endif
 
+%{!?__python2: %global __python2 %__python}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from 
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+
+%if 0%{?fedora}
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
 Name: %{name}
 Version: %{version}
 Release: %{release}
@@ -109,7 +119,7 @@ Vendor: MonetDB BV <[email protected]>
 Group: Applications/Databases
 License: MPLv2.0
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Jul2015-SP4/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2016/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
@@ -134,6 +144,7 @@ BuildRequires: liblas >= 1.8.0
 %endif
 BuildRequires: libatomic_ops-devel
 BuildRequires: libcurl-devel
+BuildRequires: xz-devel
 # BuildRequires: libmicrohttpd-devel
 # BuildRequires: libsphinxclient-devel
 BuildRequires: libuuid-devel
@@ -142,9 +153,6 @@ BuildRequires: openssl-devel
 BuildRequires: pcre-devel >= 4.5
 BuildRequires: perl
 BuildRequires: python-devel
-%if %{?rhel:0}%{!?rhel:1}
-BuildRequires: python3-devel
-%endif
 BuildRequires: readline-devel
 BuildRequires: unixODBC-devel
 # BuildRequires: uriparser-devel
@@ -162,12 +170,6 @@ Recommends: MonetDB5-server%{?_isa} = %{
 Suggests: %{name}-client%{?_isa} = %{version}-%{release}
 %endif
 
-# need to define python_sitelib on RHEL 5 and older
-# no need to define python3_sitelib: it's defined by python3-devel
-%if 0%{?rhel} && 0%{?rhel} <= 5
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from 
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%endif
-
 %description
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
@@ -414,7 +416,7 @@ Requires: %{name}-client-odbc%{?_isa} = 
 Requires: %{name}-client-perl = %{version}-%{release}
 Requires: %{name}-client-php = %{version}-%{release}
 Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
-Requires: python-monetdb = %{version}-%{release}
+Requires: python-monetdb >= 1.0
 
 %description client-tests
 MonetDB is a database management system that is developed from a
@@ -693,7 +695,7 @@ fi
 %if %{bits} == 64
 %package -n MonetDB5-server-hugeint
 Summary: MonetDB - 128-bit integer support for MonetDB5-server
-Group: Application/Databases
+Group: Applications/Databases
 Requires: MonetDB5-server%{?_isa}
 
 %description -n MonetDB5-server-hugeint
@@ -831,55 +833,6 @@ frontend of MonetDB.
 %{_libdir}/monetdb5/sql*_hge.mal
 %endif
 
-%package -n python-monetdb
-Summary: Native MonetDB client Python API
-Group: Applications/Databases
-Requires: python
-BuildArch: noarch
-Obsoletes: MonetDB-client-python
-
-%description -n python-monetdb
-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.  It also has an SQL frontend.
-
-This package contains the files needed to use MonetDB from a Python
-program.  This package is for Python version 2.  If you want to use
-Python version 3, you need %{name}-python3-monetdb.
-
-%files -n python-monetdb
-%defattr(-,root,root)
-%dir %{python_sitelib}/monetdb
-%{python_sitelib}/monetdb/*
-%{python_sitelib}/python_monetdb-*.egg-info
-%doc clients/python2/README.rst
-
-%if %{?rhel:0}%{!?rhel:1}
-%package -n python3-monetdb
-Summary: Native MonetDB client Python3 API
-Group: Applications/Databases
-Requires: python3
-BuildArch: noarch
-
-%description -n python3-monetdb
-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.  It also has an SQL frontend.
-
-This package contains the files needed to use MonetDB from a Python3
-program.  This package is for Python version 3.  If you want to use
-Python version 2, you need %{name}-python-monetdb.
-
-%files -n python3-monetdb
-%defattr(-,root,root)
-%dir %{python3_sitelib}/monetdb
-%{python3_sitelib}/monetdb/*
-%{python3_sitelib}/python_monetdb-*.egg-info
-%doc clients/python3/README.rst
-%endif
-
 %package testing
 Summary: MonetDB - Monet Database Management System
 Group: Applications/Databases
@@ -908,7 +861,6 @@ Group: Applications/Databases
 Requires: %{name}-testing = %{version}-%{release}
 Requires: %{name}-client-tests = %{version}-%{release}
 Requires: python
-BuildArch: noarch
 
 %description testing-python
 MonetDB is a database management system that is developed from a
@@ -924,8 +876,8 @@ developer, but if you do want to test, t
 %defattr(-,root,root)
 %{_bindir}/Mapprove.py
 %{_bindir}/Mtest.py
-%dir %{python_sitelib}/MonetDBtesting
-%{python_sitelib}/MonetDBtesting/*
+%dir %{python2_sitelib}/MonetDBtesting
+%{python2_sitelib}/MonetDBtesting/*
 
 %prep
 %setup -q
@@ -937,38 +889,50 @@ developer, but if you do want to test, t
        --enable-console=yes \
        --enable-debug=no \
        --enable-developer=no \
+       --enable-embedded=no \
+       --enable-embedded-r=no \
        --enable-fits=%{?with_fits:yes}%{!?with_fits:no} \
        --enable-gdk=yes \
        --enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
        --enable-gsl=yes \
        --enable-instrument=no \
+       --enable-int128=%{?with_int128:yes}%{!?with_int128:no} \
        --enable-jdbc=no \
        --enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \
+       --enable-mapi=yes \
        --enable-merocontrol=no \
        --enable-microhttpd=no \
        --enable-monetdb5=yes \
+       --enable-netcdf=no \
        --enable-odbc=yes \
        --enable-oid32=%{?oid32:yes}%{!?oid32:no} \
        --enable-optimize=yes \
        --enable-profile=no \
        
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
+       --enable-shp=no \
        --enable-sql=yes \
        --enable-strict=no \
        --enable-testing=yes \
        --with-ant=no \
        --with-bz2=yes \
+       --with-curl=yes \
+       --with-gdal=%{?with_lidar:yes}%{!?with_lidar:no} \
        --with-geos=%{?with_geos:yes}%{!?with_geos:no} \
        --with-java=no \
        --with-liblas=%{?with_lidar:yes}%{!?with_lidar:no} \
+       --with-libxml2=yes \
+       --with-lzma=yes \
+       --with-openssl=yes \
        --with-perl=yes \
        --with-perl-libdir=lib/perl5 \
+       --with-proj=no \
        --with-pthread=yes \
-       --with-python2=yes \
-       --with-python3=%{?rhel:no}%{!?rhel:yes} \
+       --with-python=yes \
        --with-readline=yes \
        --with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \
        --with-sphinxclient=no \
        --with-unixodbc=yes \
+       --with-uuid=yes \
        --with-valgrind=no \
        %{?comp_cc:CC="%{comp_cc}"}
 
@@ -998,6 +962,341 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jun 10 2016 Sjoerd Mullender <[email protected]> - 11.23.3-20160610
+- Rebuilt.
+- BZ#4015: Daemon crashes on database release command
+
+* Wed Jun 01 2016 Sjoerd Mullender <[email protected]> - 11.23.1-20160601
+- Rebuilt.
+- BZ#2407: Merovingian: allow binds to given ip/interface
+- BZ#2815: No SRID support
+- BZ#3460: incomplete implementation of JDBC driver supportsConvert(),
+  supportsConvert(int fromType, int toType) methods in
+  MonetDatabaseMetaData.java
+- BZ#3711: JDBC connection using jdbcclient.jar is very slow
+- BZ#3877: MonetDBLite should allow close then re-open databases?
+  without restarting R
+- BZ#3911: Invalid connect() call in 'redirect' mode
+- BZ#3920: query with DISTINCT and correlated scalar subquery in SELECT
+  list causes Assertion failure and crash of mserver5
+- BZ#3927: COUNT( distinct my_clob ) , QUANTILE( my_double , number )
+  fails in dev build
+- BZ#3956: MonetDBLite unable to execute LIMIT 1 statement
+- BZ#3972: Drastic Memory leak of 600GBs while generating plan for Query
+  with 25 joins
+- BZ#3974: Prepared statement rel_bin.c:2378: rel2bin_project: Assertion
+  `0' failed.
+- BZ#3975: Suspicious code in store_manager() on exit path
+- BZ#3978: SQL returns TypeException 'aggr.subcorr' undefined for
+  sys.corr function
+- BZ#3980: JOIN with references on both sides crashes mserver
+- BZ#3981: Incorrect LEFT JOIN when FROM clause contains nested subqueries
+- BZ#3983: Creation of a Foreign Key which partially maps to a primary
+  key is accepted without a warning
+- BZ#3984: Multiple paths in the .profile
+- BZ#3985: ruby-monetdb-sql gem fails for negative timezone offset
+  (USA, etc.)
+- BZ#3987: Segfault on malformed csv import
+- BZ#3991: MonetDBLite feature request: default monetdb.sequential to
+  FALSE on windows
+- BZ#3994: MonetDBLite dbDisconnect with shutdown=TRUE freezes the
+  console on windows
+- BZ#3995: NullPointerException when calling getObject()
+- BZ#3997: calling scalar functions sys.isaUUID(str) or sys.isaUUID(uuid)
+  fail
+- BZ#3999: length() returns wrong length for strings which have spaces
+  at the end of the string
+- BZ#4010: RELEASE SAVEPOINT after ALTER TABLE crashes mserver5
+- BZ#4011: sys.sessions.user column always shows 'monetdb'
+- BZ#4013: GDKextendf does not free up memory when it fails due to
+  insufficient resources
+
+* Thu May 26 2016 Martin van Dinther <[email protected]> 
- 11.23.1-20160601
+- java: Fixed problem in DatabaseMetaData.getUDTs() when it was called with
+  types parameter filled.  It used to throw SQException with message:
+  SELECT: identifier 'DATA_TYPE' unknown. Now it returns the UDTs which
+  match the provided array of data types.
+
+* Thu May 19 2016 Martin van Dinther <[email protected]> 
- 11.23.1-20160601
+- java: Implemented MonetDatabaseMetaData.supportsConvert() and
+  MonetDatabaseMetaData.supportsConvert(int fromType, int toType) methods.
+  It used to always return false. Now it returns true for the supported 
conversions.
+  This fixes Bug 3460.
+
+* Thu May 12 2016 Martin van Dinther <[email protected]> 
- 11.23.1-20160601
+- java: Corrected MonetResultSet.getObject(String columnName). It no longer
+  throws a NullPointerException in cases where internally a
+  MonetVirtualResultSet is used.
+
+* Thu May 12 2016 Martin van Dinther <[email protected]> 
- 11.23.1-20160601
+- java: Improved JdbcClient program when presenting query data to console.
+  It used to send an SQL catalog query for each query result column
+  which slowed down the interactive response considerably.
+  These additional SQL catalog queries have been eliminated.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to