Changeset: 9a5dd430cb24 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a5dd430cb24
Modified Files:
MonetDB.spec
configure.ag
Branch: Feb2013
Log Message:
Merge with Oct2012 branch.
diffs (120 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -33,8 +33,8 @@ BuildRequires: bison
BuildRequires: bzip2-devel
# BuildRequires: cfitsio-devel
BuildRequires: flex
-%if %{?centos:0}%{!?centos:1}
-# no geos library on CentOS
+%if %{?rhel:0}%{!?rhel:1}
+# no geos library on RedHat Enterprise Linux and derivatives
BuildRequires: geos-devel >= 2.2.0
%endif
BuildRequires: libcurl-devel
@@ -44,12 +44,14 @@ BuildRequires: openssl-devel
BuildRequires: pcre-devel >= 4.5
BuildRequires: perl
BuildRequires: python-devel
+%if %{?rhel:0}%{!?rhel:1}
BuildRequires: python3-devel
+%endif
# BuildRequires: raptor-devel >= 1.4.16
BuildRequires: readline-devel
BuildRequires: ruby
BuildRequires: rubygems
-%if %{?centos:0}%{!?centos:1}
+%if %{?rhel:0}%{!?rhel:1}
BuildRequires: rubygems-devel
%endif
BuildRequires: unixODBC-devel
@@ -335,7 +337,7 @@ developer.
%{_bindir}/sqlsample.php
%{_bindir}/sqlsample.pl
-%if %{?centos:0}%{!?centos:1}
+%if %{?rhel:0}%{!?rhel:1}
%package geom-MonetDB5
Summary: MonetDB5 SQL GIS support module
Group: Applications/Databases
@@ -429,7 +431,7 @@ fi
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
%dir %{_libdir}/monetdb5/autoload
-%if %{?centos:0}%{!?centos:1}
+%if %{?rhel:0}%{!?rhel:1}
%exclude %{_libdir}/monetdb5/geom.mal
%endif
# %exclude %{_libdir}/monetdb5/rdf.mal
@@ -442,7 +444,7 @@ fi
%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal
%{_libdir}/monetdb5/autoload/*_udf.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
-%if %{?centos:0}%{!?centos:1}
+%if %{?rhel:0}%{!?rhel:1}
%exclude %{_libdir}/monetdb5/lib_geom.so
%endif
# %exclude %{_libdir}/monetdb5/lib_rdf.so
@@ -505,7 +507,7 @@ systemd-tmpfiles --create %{_sysconfdir}
%{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.sql
%dir %{_libdir}/monetdb5/createdb
-%if %{?centos:0}%{!?centos:1}
+%if %{?rhel:0}%{!?rhel:1}
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
%endif
# %exclude %{_libdir}/monetdb5/createdb/*_rdf.sql
@@ -539,6 +541,7 @@ program.
%{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
@@ -560,6 +563,7 @@ program.
%{python3_sitelib}/monetdb/*
%{python3_sitelib}/python_monetdb-*.egg-info
%doc clients/python3/README.rst
+%endif
%package testing
Summary: MonetDB - Monet Database Management System
@@ -626,7 +630,7 @@ developer, but if you do want to test, t
--enable-developer=no \
--enable-fits=no \
--enable-gdk=yes \
- --enable-geom=%{?centos:no}%{!?centos:yes} \
+ --enable-geom=%{?rhel:no}%{!?rhel:yes} \
--enable-instrument=no \
--enable-jaql=yes \
--enable-jdbc=no \
@@ -642,14 +646,14 @@ developer, but if you do want to test, t
--enable-testing=yes \
--with-ant=no \
--with-bz2=yes \
- --with-geos=%{?centos:no}%{!?centos:yes} \
+ --with-geos=%{?rhel:no}%{!?rhel:yes} \
--with-hwcounters=no \
--with-java=no \
--with-mseed=no \
--with-perl=yes \
--with-pthread=yes \
--with-python2=yes \
- --with-python3=yes \
+ --with-python3=%{?rhel:no}%{!?rhel:yes} \
--with-readline=yes \
--with-rubygem=yes \
--with-rubygem-dir="%{gem_dir}" \
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -430,7 +430,7 @@ case "$host_os" in
| 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|^\(Scientific\) Linux SL release \([[0-9]][[^
\n]]*\)\( .*\)*$|\1:\2|'`"
+ | sed 's|^\(Scientific\) Linux.* release \([[0-9]][[^
\n]]*\)\( .*\)*$|\1:\2|'`"
elif test -s /etc/SuSE-release ; then
LINUX_DIST="`cat /etc/SuSE-release | head -n1 \
| sed 's|^.*\(S[[Uu]]SE\) LINUX Enterprise
\([[SD]]\)[[ervsktop]]* \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\3E\2|' \
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
