Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18655/10.3/unstable/main/finkinfo/libs
Modified Files:
gdal-grass.info gdal-python-py.info gdal.info
Log Message:
Fixed version/dependency problems
Index: gdal-python-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/gdal-python-py.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gdal-python-py.info 21 Mar 2006 02:34:57 -0000 1.7
+++ gdal-python-py.info 20 Apr 2006 05:03:11 -0000 1.8
@@ -2,7 +2,7 @@
Package: gdal-python-py%type_pkg[python]
Type: python(2.4 2.3)
Version: 1.3.1
-Revision: 2
+Revision: 4
Description: GDAL Python Module
License: BSD
Homepage: http://www.gdal.org
@@ -11,7 +11,7 @@
# Dependencies.
Depends: <<
gdal-shlibs (=%v-%r),
- postgresql80 (>= 8.0.2-13) | postgresql80-ssl (>= 8.0.2-13),
+ postgresql80-unified,
(%type_raw[python] = 2.4) python%type_pkg[python],
python%type_pkg[python]-shlibs, numeric-py%type_pkg[python]
<<
@@ -19,7 +19,7 @@
libiconv-dev, cfitsio,
libgeos2,
libogdi3,
- postgresql80-dev (>= 8.0.2-13) | postgresql80-ssl-dev (>= 8.0.2-13)
+ postgresql80-dev-unified
<<
Conflicts:
@@ -54,7 +54,7 @@
perl -pi.bak -e 's,^PYTHON = [EMAIL PROTECTED]@,PYTHON =
%p/bin/python%type_raw[python],' GDALmake.opt.in
perl -pi.bak -e 's,^PY_LD_SHARED = [EMAIL PROTECTED]@,PY_LD_SHARED = ,'
GDALmake.opt.in
perl -pi.bak -e 's,^INST_PYMOD = [EMAIL PROTECTED]@,INST_PYMOD
= %i/lib/python%type_raw[python]/site-packages,' GDALmake.opt.in
-
+
./configure %c
make
Index: gdal-grass.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/gdal-grass.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gdal-grass.info 27 Dec 2005 20:22:49 -0000 1.2
+++ gdal-grass.info 20 Apr 2006 05:03:11 -0000 1.3
@@ -1,7 +1,7 @@
Info2: <<
Package: gdal-grass
Version: 1.3.1
-Revision: 1
+Revision: 4
Description: GRASS plug-in for GDAL/OGR
License: BSD
Homepage: http://www.gdal.org
@@ -18,7 +18,7 @@
xerces-c-dev,
sqlite3-dev,
libgeos2,
- postgresql80-dev (>= 8.0.2-13) | postgresql80-ssl-dev (>= 8.0.2-13),
+ postgresql80-dev-unified,
libgettext3-dev, hdf5
<<
Index: gdal.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/gdal.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gdal.info 14 Apr 2006 04:58:21 -0000 1.12
+++ gdal.info 20 Apr 2006 05:03:11 -0000 1.13
@@ -1,7 +1,7 @@
Info2: <<
Package: gdal
Version: 1.3.1
-Revision: 3
+Revision: 4
Description: Raster/Vector Geospatial Format Translator
License: BSD
Homepage: http://www.gdal.org
@@ -36,7 +36,7 @@
# Dependencies.
Depends: <<
%n-shlibs (= %v-%r),
- postgresql80 (>= 8.0.2-13) | postgresql80-ssl (>= 8.0.2-13)
+ postgresql80-unified
<<
Suggests: gdal-python-py23, gdal-grass
@@ -53,12 +53,12 @@
xerces-c-dev,
sqlite3-dev,
libgeos2,
- postgresql80-dev (>= 8.0.2-13) | postgresql80-ssl-dev (>= 8.0.2-13),
+ postgresql80-dev-unified,
proj, szip
<<
-Conflicts: gdal, gdal-nopgsql, gdal-ssl, gdal-grass
-Replaces: gdal, gdal-nopgsql, gdal-ssl, gdal-grass
+Conflicts: gdal, gdal-nopgsql, gdal-dev
+Replaces: gdal, gdal-nopgsql
#BuildConflicts: gdal-dev (<< %v)
# Unpack Phase.
@@ -78,10 +78,6 @@
SetCPPFLAGS: -Os -I%b/port -I%b/gcore -I%b/alg -I%b/ogr -I%b/ogr/ogrsf_frmts
-I%b/ogr/ogrsf_frmts/gtiff -I%p/include
-#SetLDFLAGS: -L%p/lib/grass-6.0
-#SetLIBRARY_PATH: %p/lib/grass-6.0
-#SetDYLD_LIBRARY_PATH: %p/lib/grass-6.0
-
ConfigureParams: --mandir='${prefix}/share/man' --with-local=%p --with-libz=%p
--with-grass=no --with-cfitsio=%p --with-pcraster=no --with-netcdf=%p
--with-png=%p --with-libtiff=%p --with-geotiff=internal --with-jpeg=%p
--with-gif=%p --with-ogdi=%p --with-fme=no --without-hdf4 --with-hdf5=%p
--with-jasper=no --with-ecw=no --with-kakadu=no --with-mrsid=no --with-bsb
--with-ogr --with-pg=%p/bin/pg_config --with-mysql=no --with-xerces
--with-xerces-inc=%p/include --with-xerces-lib='-L%p/lib -lxerces-c -lpthread'
--with-odbc=%p --with-oci=no --with-dods-root=no --with-sqlite=%p
--with-geos=%p/bin/geos-config --with-static-proj4=%p --without-perl
--without-php --without-ruby --without-python
CompileScript: <<
@@ -103,8 +99,8 @@
SplitOff: <<
Package: %N-shlibs
Description: GDAL/OGR shared libraries
- Replaces: %N (<< 1.2.1-11), gdal-shlibs, gdal-nopgsql-shlibs
- Conflicts: %N (<< 1.2.1-11), gdal-shlibs, gdal-nopgsql-shlibs
+ Replaces: %N (<< %v-%r), gdal-shlibs, gdal-nopgsql-shlibs
+ Conflicts: %N (<< %v-%r), gdal-shlibs, gdal-nopgsql-shlibs
Depends: <<
giflib-shlibs | libungif-shlibs, libjpeg-shlibs, libpng3-shlibs,
libtiff-shlibs (>= 3.6.0), netcdf-shlibs,
proj-shlibs, libgeos2-shlibs,
@@ -120,8 +116,8 @@
SplitOff2: <<
Package: %N-dev
Description: GDAL/OGR development headers
- Replaces: %N (<< 1.2.1-11), gdal-dev, gdal-nopgsql-dev
- Conflicts: %N (<< 1.2.1-11), gdal-dev, gdal-nopgsql-dev
+ Replaces: %N (<< %v-%r), gdal-dev, gdal-nopgsql-dev
+ Conflicts: %N (<< %v-%r), gdal-dev, gdal-nopgsql-dev
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Files: bin/gdal-config include/gdal1 lib/*.a lib/*.la lib/libgdal.dylib
share/man/man1/gdal-config.1
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
