packages: gdal/gdal.spec - -devel deps - enabled EPSILON support - mdb supp...

[qboosh]

Author: qboosh                       Date: Fri Feb  3 19:53:24 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- -devel deps
- enabled EPSILON support
- mdb support needs rpath for libjvm

---- Files affected:
packages/gdal:
   gdal.spec (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: packages/gdal/gdal.spec
diff -u packages/gdal/gdal.spec:1.101 packages/gdal/gdal.spec:1.102
--- packages/gdal/gdal.spec:1.101	Sun Jan 29 10:00:36 2012
+++ packages/gdal/gdal.spec	Fri Feb  3 20:53:18 2012
@@ -1,7 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - epsilon (--with-epsilon; http://sourceforge.net/projects/epsilon-project/)
-# - libgta (http://gta.nongnu.org/libgta.html)
 # - spatialite (--with-spatialite; libspatialite: http://www.gaia-gis.it/gaia-sins/)
 # - freexl (http://www.gaia-gis.it/FreeXL/)
 # - rasdaman (--with-rasdaman; http://rasdaman.eecs.jacobs-university.de/trac/rasdaman/wiki/Download)
@@ -26,6 +24,7 @@
 #   - OpenCL (--with-opencl; no free Linux implementation yet?)
 #
 # Conditional build:
+%bcond_without	epsilon	# EPSILON wavelet compression support
 %bcond_without	gta	# GTA format support
 %bcond_without	odbc	# disable ODBC DB support
 %bcond_with	podofo	# PDF support via podofo instead of poppler
@@ -58,6 +57,7 @@
 BuildRequires:	cfitsio-devel
 BuildRequires:	curl-devel
 BuildRequires:	doxygen >= 1.4.2
+%{?with_epsilon:BuildRequires:	epsilon-compressor-devel}
 BuildRequires:	expat-devel >= 1.95.0
 BuildRequires:	geos-devel >= 2.2.0
 BuildRequires:	giflib-devel >= 4.0
@@ -140,26 +140,38 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	cfitsio-devel
+Requires:	curl-devel
+%{?with_epsilon:Requires:	epsilon-compressor-devel}
 Requires:	expat-devel >= 1.95.0
 Requires:	geos-devel >= 2.2.0
-Requires:	giflib-devel
+Requires:	giflib-devel >= 4.0
 Requires:	hdf-devel >= 4.0
 Requires:	hdf5-devel
 Requires:	jasper-devel
+%{?with_java:Requires:	jdk}
 Requires:	libcsf-devel
 Requires:	libdap-devel >= 3.10
 Requires:	libgeotiff-devel >= 1.2.1
-Requires:	libjpeg-devel
+%{?with_gta:Requires:	libgta-devel}
+Requires:	libjpeg-devel >= 6b
 Requires:	libpng-devel >= 2:1.2.8
 Requires:	libstdc++-devel
 Requires:	libtiff-devel >= 4.0
+Requires:	libuuid-devel
+Requires:	libwebp-devel
+Requires:	libxml2-devel
 Requires:	netcdf-devel >= 4
 Requires:	ogdi-devel >= 3.1
 #Requires:	pcidsk-devel > 0.3
+%{?with_podofo:Requires:	podofo-devel}
+%{?with_poppler:Requires:	poppler-devel}
 Requires:	postgresql-devel
+Requires:	proj-devel >= 4
 Requires:	sqlite3-devel >= 3.0.0
 %{?with_odbc:Requires:	unixODBC-devel}
 %{?with_xerces:Requires:	xerces-c-devel >= 2.7.0}
+Requires:	xz-devel
+Requires:	zlib-devel >= 1.1.4
 
 %description devel
 GDAL library header files.
@@ -254,11 +266,12 @@
 %configure \
 	--datadir=%{_datadir}/gdal \
 	--with-dods-root=/usr \
+	%{?with_epsilon:--with-epsilon} \
 	%{!?with_gta:--without-gta} \
 	--with-hide-internal-symbols \
 	%{?with_java:--with-java=%{java_home}} \
 	--with-liblzma \
-	%{?with_java:--with-mdb} \
+	%{?with_java:--with-mdb --with-jvm-lib-add-rpath} \
 	--with-perl \
 	%{?with_php:--with-php} \
 	%{?with_podofo:--with-podofo} \
@@ -490,6 +503,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2012/02/03 19:53:18  qboosh
+- -devel deps
+- enabled EPSILON support
+- mdb support needs rpath for libjvm
+
 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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal.spec?r1=1.101&r2=1.102&f=u