Author: qboosh Date: Sun Jan 29 09:00:41 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- enabled GTA support by default
- use pkg-config to get libdap includes (fixes build with libdap 3.11.2)
---- Files affected:
packages/gdal:
gdal.spec (1.100 -> 1.101)
---- Diffs:
================================================================
Index: packages/gdal/gdal.spec
diff -u packages/gdal/gdal.spec:1.100 packages/gdal/gdal.spec:1.101
--- packages/gdal/gdal.spec:1.100 Sun Jan 22 12:50:02 2012
+++ packages/gdal/gdal.spec Sun Jan 29 10:00:36 2012
@@ -26,12 +26,13 @@
# - OpenCL (--with-opencl; no free Linux implementation yet?)
#
# Conditional build:
-%bcond_without odbc # disable odbc support
+%bcond_without gta # GTA format support
+%bcond_without odbc # disable ODBC DB support
%bcond_with podofo # PDF support via podofo instead of poppler
%bcond_without poppler # PDF support via poppler
%bcond_without xerces # disable xerces support
%bcond_without java # disable Java and MDB support
-%bcond_without php # disable PHP bindind
+%bcond_without php # disable PHP binding
%bcond_without ruby # disable ruby binding
#
%if %{with podofo}
@@ -68,6 +69,7 @@
BuildRequires: libcsf-devel
BuildRequires: libdap-devel >= 3.10
BuildRequires: libgeotiff-devel >= 1.2.1
+%{?with_gta:BuildRequires: libgta-devel}
BuildRequires: libjpeg-devel >= 6b
#BuildRequires: libkml-devel >= 1.3.0
BuildRequires: libpng-devel >= 2:1.2.8
@@ -94,6 +96,7 @@
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.344
%{?with_ruby:BuildRequires: ruby-devel}
+BuildRequires: sed >= 4.0
BuildRequires: sqlite3-devel >= 3.0.0
BuildRequires: swig-perl
BuildRequires: swig-python >= 1.3
@@ -241,6 +244,8 @@
%{__rm} -r man
+%{__sed} -i -e 's,DODS_INC="-I.*,DODS_INC="$(pkg-config --cflags libdap)",'
configure.in
+
%build
%{__libtoolize}
%{__aclocal} -I m4
@@ -249,6 +254,7 @@
%configure \
--datadir=%{_datadir}/gdal \
--with-dods-root=/usr \
+ %{!?with_gta:--without-gta} \
--with-hide-internal-symbols \
%{?with_java:--with-java=%{java_home}} \
--with-liblzma \
@@ -484,6 +490,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.101 2012/01/29 09:00:36 qboosh
+- enabled GTA support by default
+- use pkg-config to get libdap includes (fixes build with libdap 3.11.2)
+
Revision 1.100 2012/01/22 11:50:02 qboosh
- typo
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal.spec?r1=1.100&r2=1.101&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
