Changeset: 5b2c640ceed9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b2c640ceed9
Modified Files:
MonetDB.spec
buildtools/ChangeLog.Apr2011
Branch: Apr2011
Log Message:
No geos library available on CentOS, so add conditionals in spec file.
With this change, RPMs can be built on CentOS 6.0.
diffs (92 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,14 +381,18 @@
%{_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
%{_libdir}/monetdb5/*.mal
# %{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_vault.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
@@ -436,7 +445,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
@@ -536,6 +547,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.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
