Changeset: 13081e9b4d43 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13081e9b4d43
Added Files:
debian/libmonetdb5-server-cfitsio.install
debian/monetdb-python3.install
sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql
sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err
sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out
sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql
sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err
sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out
sql/test/miscellaneous/Tests/declared_tables.sql
sql/test/miscellaneous/Tests/declared_tables.stable.err
sql/test/miscellaneous/Tests/declared_tables.stable.out
sql/test/sys-schema/Tests/bam_tables_checks.sql
sql/test/sys-schema/Tests/bam_tables_checks.stable.err
sql/test/sys-schema/Tests/bam_tables_checks.stable.out
sql/test/sys-schema/Tests/check_Not_Nullable_columns.sql
sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.err
sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
sql/test/sys-schema/Tests/geom_tables_checks.sql
sql/test/sys-schema/Tests/geom_tables_checks.stable.err
sql/test/sys-schema/Tests/geom_tables_checks.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
tools/merovingian/daemon/config/.merovingian_properties.in
tools/merovingian/daemon/config/Makefile.ag
tools/merovingian/daemon/config/monetdbd.in
tools/merovingian/daemon/config/monetdbd.service.in
Removed Files:
tools/merovingian/daemon/.merovingian_properties.in
tools/merovingian/daemon/monetdbd.service.in
Modified Files:
.hgtags
MonetDB.spec
NT/mksqlwxs.py
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
buildtools/doc/windowsbuild.rst
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/examples/C/Makefile.ag
clients/mapiclient/Makefile.ag
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/Makefile.ag
common/stream/monetdb-stream.pc.in
common/stream/stream.c
common/stream/stream.h
configure.ag
debian/changelog
debian/control
debian/fix-deb.sh
debian/monetdb5-sql.install
debian/rules
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/gdk_hash.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_tm.c
gdk/gdk_utils.c
gdk/gdk_utils.h
gdk/libbat.rc
geom/lib/Makefile.ag
geom/monetdb5/Makefile.ag
geom/monetdb5/geom_upgrade.c
libversions
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/extras/rapi/rapi.c
monetdb5/extras/rapi/rapi.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_runtime.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batmmath.mal
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/00_batcalc_hge.mal
monetdb5/modules/mal/00_batcalc_hge.mal.sh
monetdb5/modules/mal/01_batcalc.mal
monetdb5/modules/mal/01_batcalc.mal.sh
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/tools/libmonetdb5.rc
monetdb5/tools/monetdb5.pc.in
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/include/sql_catalog.h
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out
sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_semantic.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_utils.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2018/Tests/All
sql/test/Tests/setoptimizer.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/miscellaneous/Tests/All
sql/test/pg_regress/Tests/update.stable.out
sql/test/sys-schema/Tests/All
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
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/upgrade.stable.out.int128
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
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Aug2018
tools/merovingian/client/Makefile.ag
tools/merovingian/daemon/Makefile.ag
tools/mserver/Makefile.ag
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
vertoo.config
vertoo.data
Branch: candidate-type
Log Message:
Merge with default branch.
diffs (truncated from 100026 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -703,3 +703,12 @@ e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b
44182a802530768278cf750fd93c829acdde29f1 Aug2018_root
9c824ea44063e239b7251dce71f9af741c682211 Aug2018_1
9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release
+2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_3
+9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release
+2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release
+3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_5
+2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release
+3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
+a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7
+3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
+a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,39 +1,39 @@
-%define name MonetDB
-%define version 11.32.0
+%global name MonetDB
+%global version 11.32.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
-# groups of related archs
-%define all_x86 i386 i586 i686
-
-%ifarch %{all_x86}
-%define bits 32
-%else
-%define bits 64
-%define with_int128 1
+# Use bcond_with to add a --with option; i.e., "without" is default.
+# Use bcond_without to add a --without option; i.e., "with" is default.
+# The --with OPTION and --without OPTION arguments can be passed on
+# the commandline of both rpmbuild and mock.
+
+# On 64 bit architectures we build "hugeint" packages.
+%if "%{?_lib}" == "lib64"
+%bcond_without hugeint
%endif
-%define release %{buildno}%{?dist}
+%global release %{buildno}%{?dist}
# On RedHat Enterprise Linux and derivatives, if the Extra Packages
-# for Enterprise Linux (EPEL) repository is available, you can define
-# the _with_epel macro. When using mock to build the RPMs, this can
-# be done using the --with=epel option to mock.
-# If the EPEL repository is availabe, or if building for Fedora, all
+# for Enterprise Linux (EPEL) repository is available, you can enable
+# its use by providing rpmbuild or mock with the "--with epel" option.
+# If the EPEL repository is availabe, or if building for Fedora, most
# optional sub packages can be built. We indicate that here by
# setting the macro fedpkgs to 1. If the EPEL repository is not
# available and we are not building for Fedora, we set fedpkgs to 0.
%if %{?rhel:1}%{!?rhel:0}
# RedHat Enterprise Linux (or CentOS or Scientific Linux)
-%if %{?_with_epel:1}%{!?_with_epel:0}
+%bcond_with epel
+%if %{with epel}
# EPEL is enabled through the command line
-%define fedpkgs 1
+%global fedpkgs 1
%else
# EPEL is not enabled
-%define fedpkgs 0
+%global fedpkgs 0
%endif
%else
# Not RHEL (so presumably Fedora)
-%define fedpkgs 1
+%global fedpkgs 1
%endif
# On Fedora, the geos library is available, and so we can require it
@@ -45,7 +45,8 @@
# up-to-date version of RHEL.
%if %{fedpkgs}
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-%define with_geos 1
+# By default create the MonetDB-geom-MonetDB5 package on Fedora and RHEL 7
+%bcond_without geos
%endif
%endif
@@ -55,74 +56,49 @@
# available if EPEL is enabled, and then only on version 7.
%if %{fedpkgs}
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-# If the _without_lidar macro is not set, the MonetDB-lidar RPM will
-# be created. The macro can be set when using mock by passing it the
-# flag --without=lidar.
-%if %{?_without_lidar:0}%{!?_without_lidar:1}
-%define with_lidar 1
-%endif
+# By default create the MonetDB-lidar package on Fedora and RHEL 7
+%bcond_without lidar
%endif
%endif
%if %{?rhel:0}%{!?rhel:1}
-# If the _without_samtools macro is not set, the MonetDB-bam-MonetDB5
-# RPM will be created. The macro can be set when using mock by
-# passing it the flag --without=samtools.
+# By default create the MonetDB-bam-MonetDB5 package.
# Note that the samtools-devel RPM is not available on RedHat
# Enterprise Linux and derivatives, even with EPEL availabe.
# (Actually, at the moment of writing, samtools-devel is available in
# EPEL for RHEL 6, but not for RHEL 7. We don't make the distinction
# here and just not build the MonetDB-bam-MonetDB5 RPM.)
-%if %{?_without_samtools:0}%{!?_without_samtools:1}
-%define with_samtools 1
+%bcond_without samtools
%endif
+
+# By default use PCRE for the implementation of the SQL LIKE and ILIKE
+# operators. Otherwise the POSIX regex functions are used.
+%bcond_without pcre
+
+%if %{fedpkgs}
+# By default, create the MonetDB-R package.
+%bcond_without rintegration
%endif
-# If the _without_pcre macro is not set, the PCRE library is used for
-# the implementation of the SQL LIKE and ILIKE operators. Otherwise
-# the POSIX regex functions are used. The macro can be set when using
-# mock by passing it the flag --without=pcre.
-%if %{?_without_pcre:0}%{!?_without_pcre:1}
-%define with_pcre 1
+# On Fedora and RHEL 7, create the MonetDB-python2 package.
+# On RHEL 6, numpy is too old.
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+%bcond_without py2integration
+%endif
+%if %{?rhel:0}%{!?rhel:1}
+# On RHEL 6, Python 3 is too old, and on RHEL 7, the default Python 3
+# is too old (in both cases 3.4).
+%bcond_without py3integration
%endif
%if %{fedpkgs}
-# If the _without_rintegration macro is not set, the MonetDB-R RPM
-# will be created. The macro can be set when using mock by passing it
-# the flag --without=rintegration.
-%if %{?_without_rintegration:0}%{!?_without_rintegration:1}
-%define with_rintegration 1
-%endif
-%endif
-
-# If the _without_pyintegration macro is not set, the MonetDB-python2
-# RPM will be created. The macro can be set when using mock by
-# passing it the flag --without=pyintegration.
-# On RHEL 6, numpy is too old.
-%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-%if %{?_without_pyintegration:0}%{!?_without_pyintegration:1}
-%define with_pyintegration 1
-%endif
-%endif
-
-%if %{fedpkgs}
-# If the _with_fits macro is set, the MonetDB-cfitsio RPM will be
-# created. The macro can be set when using mock by passing it the
-# flag --with=fits.
-%if %{?_with_fits:1}%{!?_with_fits:0}
-%define with_fits 1
-%endif
+# By default, create the MonetDB-cfitsio package.
+%bcond_without fits
%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}
@@ -143,40 +119,44 @@ BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: hardlink
%endif
+BuildRequires: gcc
BuildRequires: bison
+%if %{?rhel:1}%{!?rhel:0}
BuildRequires: bzip2-devel
-%if %{?with_fits:1}%{!?with_fits:0}
-BuildRequires: cfitsio-devel
+%else
+BuildRequires: pkgconfig(bzip2)
%endif
-BuildRequires: gcc
-%if %{?with_geos:1}%{!?with_geos:0}
+%if %{with fits}
+BuildRequires: pkgconfig(cfitsio)
+%endif
+%if %{with geos}
BuildRequires: geos-devel >= 3.4.0
%endif
-%if %{?with_lidar:1}%{!?with_lidar:0}
+%if %{with lidar}
BuildRequires: liblas-devel >= 1.8.0
-BuildRequires: gdal-devel
-BuildRequires: libgeotiff-devel
-# Fedora 22 liblas-devel does not depend on liblas:
-BuildRequires: liblas >= 1.8.0
+BuildRequires: pkgconfig(gdal)
%endif
-BuildRequires: libatomic_ops-devel
-BuildRequires: libcurl-devel
-BuildRequires: xz-devel
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+# RHEL >= 7, and all current Fedora
+BuildRequires: pkgconfig(atomic_ops)
+%endif
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(liblzma)
# BuildRequires: libmicrohttpd-devel
BuildRequires: libuuid-devel
-BuildRequires: libxml2-devel
-BuildRequires: openssl-devel
-%if %{?with_pcre:1}%{!?with_pcre:0}
-BuildRequires: pcre-devel >= 4.5
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(openssl)
+%if %{with pcre}
+BuildRequires: pkgconfig(libpcre) >= 4.5
%endif
BuildRequires: readline-devel
BuildRequires: unixODBC-devel
# BuildRequires: uriparser-devel
-BuildRequires: zlib-devel
-%if %{?with_samtools:1}%{!?with_samtools:0}
+BuildRequires: pkgconfig(zlib)
+%if %{with samtools}
BuildRequires: samtools-devel
%endif
-%if %{?with_pyintegration:1}%{!?with_pyintegration:0}
+%if %{with py2integration}
BuildRequires: python-devel
%if %{?rhel:1}%{!?rhel:0}
# RedHat Enterprise Linux calls it simply numpy
@@ -190,7 +170,11 @@ BuildRequires: numpy
%endif
%endif
%endif
-%if %{?with_rintegration:1}%{!?with_rintegration:0}
+%if %{with py3integration}
+BuildRequires: python3-devel >= 3.5
+BuildRequires: python3-numpy
+%endif
+%if %{with rintegration}
BuildRequires: R-core-devel
%endif
@@ -439,13 +423,11 @@ developer.
%{_bindir}/sqlsample.php
%{_bindir}/sqlsample.pl
-%if %{?with_geos:1}%{!?with_geos:0}
+%if %{with geos}
%package geom-MonetDB5
Summary: MonetDB5 SQL GIS support module
Group: Applications/Databases
Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-geom
-Obsoletes: %{name}-geom-devel
%description geom-MonetDB5
MonetDB is a database management system that is developed from a
@@ -464,7 +446,7 @@ extensions for %{name}-SQL-server5.
%{_libdir}/monetdb5/lib_geom.so
%endif
-%if %{?with_lidar:1}%{!?with_lidar:0}
+%if %{with lidar}
%package lidar
Summary: MonetDB5 SQL support for working with LiDAR data
Group: Applications/Databases
@@ -486,7 +468,7 @@ This package contains support for readin
%{_libdir}/monetdb5/lib_lidar.so
%endif
-%if %{?with_samtools:1}%{!?with_samtools:0}
+%if %{with samtools}
%package bam-MonetDB5
Summary: MonetDB5 SQL interface to the bam library
Group: Applications/Databases
@@ -509,7 +491,7 @@ version of Sequence Alignment/Map) data.
%{_libdir}/monetdb5/lib_bam.so
%endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
