Changeset: 6aa0084a7753 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6aa0084a7753
Modified Files:
MonetDB.spec
Branch: Jun2016
Log Message:
On RHEL (EPEL) 6, geos is too old, and liblas is not available.
diffs (57 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -44,17 +44,21 @@
# and build the geom modules. On RedHat Enterprise Linux and
# derivatives (CentOS, Scientific Linux), the geos library is not
# available. However, the geos library is available in the Extra
-# Packages for Enterprise Linux (EPEL). In other words, we can check
-# the fedpkgs macro (see above).
+# Packages for Enterprise Linux (EPEL). However, On RHEL 6, the geos
+# library is too old for us, so we need an extra check for an
+# up-to-date version of RHEL.
%if %{fedpkgs}
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
%define with_geos 1
%endif
+%endif
# On Fedora, the liblas library is available, and so we can require it
# and build the lidar modules. On RedHat Enterprise Linux and
-# derivatives (CentOS, Scientific Linux), the liblas library is not
-# available, even with EPEL available.
-%if %{?rhel:0}%{!?rhel:1}
+# derivatives (CentOS, Scientific Linux), the liblas library is only
+# 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.
@@ -62,6 +66,7 @@
%define with_lidar 1
%endif
%endif
+%endif
%if %{?rhel:0}%{!?rhel:1}
# If the _without_samtools macro is not set, the MonetDB-bam-MonetDB5
@@ -117,13 +122,15 @@ BuildRequires: bzip2-devel
BuildRequires: cfitsio-devel
%endif
%if %{?with_geos:1}%{!?with_geos:0}
-BuildRequires: geos-devel >= 3.0.0
+BuildRequires: geos-devel >= 3.4.0
%endif
BuildRequires: gsl-devel
%if %{?with_lidar:1}%{!?with_lidar:0}
-BuildRequires: liblas-devel gdal-devel libgeotiff-devel
+BuildRequires: liblas-devel >= 1.8.0
+BuildRequires: gdal-devel
+BuildRequires: libgeotiff-devel
# Fedora 22 liblas-devel does not depend on liblas:
-BuildRequires: liblas
+BuildRequires: liblas >= 1.8.0
%endif
BuildRequires: libatomic_ops-devel
BuildRequires: libcurl-devel
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
