Changeset: 5a23b1f40497 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a23b1f40497
Added Files:
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
Modified Files:
MonetDB.spec
NT/rules.msc
clients/examples/C/Makefile.ag
clients/mapiclient/Makefile.ag
common/stream/Makefile.ag
common/stream/monetdb-stream.pc.in
configure.ag
geom/lib/Makefile.ag
geom/monetdb5/Makefile.ag
monetdb5/tools/monetdb5.pc.in
sql/test/BugTracker-2018/Tests/All
tools/merovingian/client/Makefile.ag
tools/merovingian/daemon/Makefile.ag
tools/mserver/Makefile.ag
Branch: analytics
Log Message:
Merge with default
diffs (truncated from 1465 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -2,29 +2,29 @@
%define 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}
# 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.
+# 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, all
# 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
%else
@@ -45,7 +45,7 @@
# up-to-date version of RHEL.
%if %{fedpkgs}
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-%define with_geos 1
+%bcond_without geos
%endif
%endif
@@ -55,73 +55,50 @@
# 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
-%endif
+%bcond_without samtools
%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
+# 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 teh MonetDB-R package.
+%bcond_without rintegration
+%endif
+
+# 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 pyintegration
%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, do not create the MonetDB-cfitsio package.
+%bcond_with 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
+# python3 option not currently used
+# %if 0%{?fedora}
+# %bcond_without python3
+# %else
+# %bcond_with python3
+# %endif
Name: %{name}
Version: %{version}
@@ -143,40 +120,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 pyintegration}
BuildRequires: python-devel
%if %{?rhel:1}%{!?rhel:0}
# RedHat Enterprise Linux calls it simply numpy
@@ -190,7 +171,7 @@ BuildRequires: numpy
%endif
%endif
%endif
-%if %{?with_rintegration:1}%{!?with_rintegration:0}
+%if %{with rintegration}
BuildRequires: R-core-devel
%endif
@@ -439,7 +420,7 @@ 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
@@ -464,7 +445,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 +467,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 +490,7 @@ version of Sequence Alignment/Map) data.
%{_libdir}/monetdb5/lib_bam.so
%endif
-%if %{?with_rintegration:1}%{!?with_rintegration:0}
+%if %{with rintegration}
%package R
Summary: Integration of MonetDB and R, allowing use of R from within SQL
Group: Applications/Databases
@@ -535,7 +516,7 @@ install it.
%{_libdir}/monetdb5/lib_rapi.so
%endif
-%if %{?with_pyintegration:1}%{!?with_pyintegration:0}
+%if %{with pyintegration}
%package python2
Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
Group: Applications/Databases
@@ -561,7 +542,7 @@ install it.
%{_libdir}/monetdb5/lib_pyapi.so
%endif
-%if %{?with_fits:1}%{!?with_fits:0}
+%if %{with fits}
%package cfitsio
Summary: MonetDB: Add on module that provides support for FITS files
Group: Applications/Databases
@@ -591,7 +572,7 @@ Requires(pre): shadow-utils
Requires: %{name}-client%{?_isa} = %{version}-%{release}
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
-%if %{bits} == 64
+%if %{with hugeint}
Recommends: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
%endif
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
@@ -637,44 +618,44 @@ fi
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
%dir %{_libdir}/monetdb5/autoload
-%if %{?with_fits:1}%{!?with_fits:0}
+%if %{with fits}
%exclude %{_libdir}/monetdb5/fits.mal
%exclude %{_libdir}/monetdb5/autoload/*_fits.mal
%exclude %{_libdir}/monetdb5/createdb/*_fits.sql
%endif
-%if %{?with_geos:1}%{!?with_geos:0}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
