Changeset: 0c7b5c46aa16 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c7b5c46aa16
Modified Files:
MonetDB.spec
configure.ag
Branch: Aug2011
Log Message:
Merge with Apr2011 branch.
diffs (163 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -33,7 +33,10 @@
BuildRequires: bzip2-devel
# BuildRequires: cfitsio-devel
BuildRequires: flex
+%if %{?centos:0}%{!?centos:1}
+# no geos library on CentOS
BuildRequires: geos-devel >= 2.2.0
+%endif
BuildRequires: libcurl-devel
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
@@ -263,8 +266,8 @@
%{gemdir}/doc/activerecord-monetdb-adapter-0.1/*
%{gemdir}/doc/ruby-monetdb-sql-0.1/*
%{gemdir}/cache/*.gem
-%dir %{gemdir}/gems/activerecord-monetdb-adapter-0.1
-%dir %{gemdir}/gems/ruby-monetdb-sql-0.1
+# %dir %{gemdir}/gems/activerecord-monetdb-adapter-0.1
+# %dir %{gemdir}/gems/ruby-monetdb-sql-0.1
%{gemdir}/gems/activerecord-monetdb-adapter-0.1
%{gemdir}/gems/ruby-monetdb-sql-0.1
%{gemdir}/specifications/*.gemspec
@@ -306,6 +309,7 @@
%{_bindir}/sqlsample.pl
%{_bindir}/sqlsample.py
+%if %{?centos:0}%{!?centos:1}
%package geom-MonetDB5
Summary: MonetDB5 SQL GIS support module
Group: Applications/Databases
@@ -328,6 +332,7 @@
%{_libdir}/monetdb5/createdb/*_geom.sql
%{_libdir}/monetdb5/geom.mal
%{_libdir}/monetdb5/lib_geom.so
+%endif
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
@@ -376,7 +381,9 @@
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
%dir %{_libdir}/monetdb5/autoload
+%if %{?centos:0}%{!?centos:1}
%exclude %{_libdir}/monetdb5/geom.mal
+%endif
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%exclude %{_libdir}/monetdb5/sql_bpm.mal
@@ -385,7 +392,9 @@
%{_libdir}/monetdb5/autoload/*_vault.mal
%{_libdir}/monetdb5/autoload/*_lsst.mal
%{_libdir}/monetdb5/autoload/*_udf.mal
+%if %{?centos:0}%{!?centos:1}
%exclude %{_libdir}/monetdb5/lib_geom.so
+%endif
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.so
@@ -438,7 +447,9 @@
%{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.sql
%dir %{_libdir}/monetdb5/createdb
+%if %{?centos:0}%{!?centos:1}
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
+%endif
# %exclude %{_libdir}/monetdb5/createdb/*_rdf.sql
%{_libdir}/monetdb5/createdb/*
%{_libdir}/monetdb5/sql*.mal
@@ -538,6 +549,7 @@
--enable-fits=no \
--with-valgrind=no \
--with-mseed=no \
+ --with-geos=%{?centos:no}%{!?centos:yes}
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
%{?_with_netcdf} %{?_without_netcdf}
diff --git a/buildtools/ChangeLog.Apr2011 b/buildtools/ChangeLog.Apr2011
--- a/buildtools/ChangeLog.Apr2011
+++ b/buildtools/ChangeLog.Apr2011
@@ -1,6 +1,10 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Wed Jul 13 2011 Sjoerd Mullender <[email protected]>
+- We can now build RPMs on CentOS 6.0. Since there is no geos library
+ on CentOS, we do not support the geom modules there.
+
* Wed Jun 29 2011 Sjoerd Mullender <[email protected]>
- We can now also build on Fedora 15. This required some very minor
changes.
diff --git a/clients/perl/Cimpl/Makefile.ag b/clients/perl/Cimpl/Makefile.ag
--- a/clients/perl/Cimpl/Makefile.ag
+++ b/clients/perl/Cimpl/Makefile.ag
@@ -31,7 +31,7 @@
# MapiLib.pm.c: In function 'boot_MapiLib':
# MapiLib.pm.c:6157: warning: passing argument 2 of '_swig_create_magic'
discards qualifiers from pointer target type
# Hence, we have to disable (override) our X_CFLAGS completely:
-#X_CFLAGS = -D_GNU_SOURCE
+X_CFLAGS =
# Likewise, we need to disable W_CFLAGS=-WX (i.e., treating warnings
# as errors) for swig-generated code on Windows
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -458,13 +458,14 @@
LINUX_DIST=''
case "$host_os" in
linux*)
+ dnl Please keep this aligned / in sync with testing/Mtest.py.in !
AC_MSG_CHECKING(which Linux distribution we're using)
if test -s /etc/fedora-release ; then
LINUX_DIST="`cat /etc/fedora-release | head -n1 \
| sed 's|^.*\(Fedora\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
elif test -s /etc/centos-release ; then
LINUX_DIST="`cat /etc/centos-release | head -n1 \
- | sed 's|^\(CentOS\) release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
+ | sed 's|^\(CentOS\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
elif test -s /etc/yellowdog-release ; then
LINUX_DIST="`cat /etc/yellowdog-release | head -n1 \
| sed 's|^\(Yellow\) Dog Linux release \([[0-9]][[^
\n]]*\)\( .*\)*$|\1:\2|'`"
@@ -472,7 +473,7 @@
LINUX_DIST="`cat /etc/redhat-release | head -n1 \
| sed 's|^.*\(Red\) \(Hat\).* Linux *\([[A-Z]]*\)
release \([[0-9]][[^ \n]]*\)\( .*\)*$|\1\2:\4\3|' \
| sed 's|^Red Hat Enterprise Linux \([[AW]]S\) release
\([[0-9]][[^ \n]]*\)\( .*\)*$|RHEL:\2\1|' \
- | sed 's|^\(CentOS\) release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|' \
+ | sed 's|^\(CentOS\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|' \
| sed 's|^\(Scientific\) Linux SL release \([[0-9]][[^
\n]]*\)\( .*\)*$|\1:\2|'`"
elif test -s /etc/SuSE-release ; then
LINUX_DIST="`cat /etc/SuSE-release | head -n1 \
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2769,7 +2769,7 @@
RELEASE = "5.2"
if SYST == "Linux":
- # Please keep this aligned / in sync with configure.ag &
TestTools/.Mconfig.rc & TestTools/MdoServer !
+ # Please keep this aligned / in sync with configure.ag !
LINUX_DIST=''
if os.path.isfile('/etc/fedora-release'):
l = open('/etc/fedora-release').readline()
@@ -2778,7 +2778,7 @@
LINUX_DIST = '%s:%s' % (x.group(1),x.group(2))
elif os.path.isfile('/etc/centos-release'):
l = open('/etc/centos-release').readline()
- x = re.compile('^(CentOS) release ([0-9][^ \n]*)( .*)*$').match(l)
+ x = re.compile('^(CentOS).* release ([0-9][^ \n]*)( .*)*$').match(l)
if x:
LINUX_DIST = '%s:%s' % (x.group(1),x.group(2))
elif os.path.isfile('/etc/yellowdog-release'):
@@ -2790,7 +2790,7 @@
l = open('/etc/redhat-release').readline()
x0 = re.compile('^.*(Red) (Hat).* Linux *([A-Z]*) release ([0-9][^
\n]*)( .*)*$').match(l)
x1 = re.compile('^Red Hat Enterprise Linux ([AW]S) release ([0-9][^
\n]*)( .*)*$').match(l)
- x2 = re.compile('^(CentOS) release ([0-9][^ \n]*)( .*)*$').match(l)
+ x2 = re.compile('^(CentOS).* release ([0-9][^ \n]*)( .*)*$').match(l)
x3 = re.compile('^(Scientific) Linux SL release ([0-9][^ \n]*)(
.*)*$').match(l)
if x0:
LINUX_DIST = '%s%s:%s%s' %
(x0.group(1),x0.group(2),x0.group(4),x0.group(3))
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
