Changeset: 3cf6570bbe6d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cf6570bbe6d Modified Files: MonetDB.spec configure.ag Branch: Jul2017 Log Message:
merged diffs (100 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -783,7 +783,7 @@ systemd-tmpfiles --create %{_sysconfdir} # no _unitdir macro %exclude %{_prefix}/lib/systemd/system/monetdbd.service %endif -%config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties +%config(noreplace) %attr(664,monetdb,monetdb) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties %{_libdir}/monetdb5/autoload/??_sql.mal %{_libdir}/monetdb5/lib_sql.so %{_libdir}/monetdb5/*.sql diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -3196,17 +3196,17 @@ done echo echo "* Enabled/disabled components:" for comp in \ - 'gdk ' \ - 'monetdb5 ' \ - 'sql ' \ - 'geom ' \ - 'console ' \ - 'pyintegration' \ + 'gdk ' \ + 'monetdb5 ' \ + 'sql ' \ + 'geom ' \ + 'console ' \ + 'pyintegration ' \ 'py3integration' \ - 'rintegration' \ - 'odbc ' \ - 'testing ' \ - 'embedded ' \ + 'rintegration ' \ + 'odbc ' \ + 'testing ' \ + 'embedded ' \ ; do eval "dft=\$dft_$comp" eval "enable=\$enable_$comp" @@ -3220,31 +3220,31 @@ done echo echo "* Available features/extensions:" for comp in \ - 'atomic_ops ' \ - 'bz2 ' \ - 'curl ' \ - 'fits ' \ - 'getaddrinfo ' \ - 'gdal ' \ - 'liblas ' \ - 'liblzma ' \ - 'libxml2 ' \ - 'lidar ' \ - 'lz4 ' \ - 'netcdf ' \ - 'openssl ' \ - 'proj ' \ - 'pthread ' \ - 'python2 ' \ - 'python3 ' \ - 'readline ' \ - 'regex ' \ - 'samtools ' \ - 'shp ' \ - 'snappy ' \ - 'unixodbc ' \ - 'valgrind ' \ - 'zlib ' \ + 'atomic_ops ' \ + 'bz2 ' \ + 'curl ' \ + 'fits ' \ + 'getaddrinfo' \ + 'gdal ' \ + 'liblas ' \ + 'liblzma ' \ + 'libxml2 ' \ + 'lidar ' \ + 'lz4 ' \ + 'netcdf ' \ + 'openssl ' \ + 'proj ' \ + 'pthread ' \ + 'python2 ' \ + 'python3 ' \ + 'readline ' \ + 'regex ' \ + 'samtools ' \ + 'shp ' \ + 'snappy ' \ + 'unixodbc ' \ + 'valgrind ' \ + 'zlib ' \ ; do eval "org=\$org_have_$comp" eval "have=\$have_$comp" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list