Commit d9cf4eb4 authored by Fabio Tranchitella's avatar Fabio Tranchitella

Merge with new upstream release.

parent af40ba90
......@@ -50,5 +50,9 @@ Version 1.0.0 of PostGIS includes code from:
Version 1.1.0 of PostGIS includes patches from:
Obe, Regina <robe.dnd@cityofboston.gov> with -k switch for pgsql2shp.
Version 1.2.1 of PostGIS includes patches from:
Eduin Carrillo <yecarrillo@yahoo.com> for AsKML() and Transform()
short circuit.
See the postgis manual for more contributors.
--------- PostGIS-1.2.1 release [2007-01-11] --------------------------
2007-01-08 Markus Schaber <schabi@logix-tt.com>
* java/jdbc/Makefile:
Fixed gcj classpath problems
* src/org/postgis/DriverWrapperLW.java,
src/org/postgis/DriverWrapperAutoprobe.java,
src/org/postgis/DriverWrapper.java,
jtssrc/org/postgis/jts/JtsWrapper.java:
fixed 8.2 compatibility
2007-01-05 Sandro Santilli <strk@refractions.net>
* GNUmakefile: bring in extra/template_gis for all rules.
* extras/template_gis/Makefile: have 'install' also install manuals.
2006-12-29 Sandro Santilli <strk@refractions.net>
* configure.in: fixed GEOS_LDFLAGS detection
for older GEOS versions.
* doc/postgis.xml: cleaned up Hard Upgrade section
(was unreadable).
2006-12-22 Markus Schaber <schabi@logix-tt.com>
* java/jdbc/Makefile
Added generation of basic javadoc zip file.
2006-12-20 Sandro Santilli <strk@refractions.net>
* regress/README: wrote info about adding regression tests
2006-12-20 Kevein Neufeld <kneufeld@refractions.net>
* lwgeom/lwgeom_gist.c
Added fix to permit gist indexes to have more than 459 null
geometries in a table
2006-12-15 Markus Schaber <schabi@logix-tt.com>
* java/jdbc/Makefile
Fixed Makefile for jts tests, commented debug options better
* java/jdbc/jtssrc/org/postgis/jts/JtsBinaryWriter.java
Fix multi-dimension handling in JtsBinaryWriter, thanks to
Thomas Marti for the hints
* java/jdbc/jtssrc/examples/JtsTestParser.java
Improved SRID handling in regression tests and added
CoordinateArraySequence tests.
2006-12-15 Eduin Carrillo <yecarrillo@yahoo.com>
* lwgeom/lwgeom_transform.c:
short circuit when source and target SRID are the same.
2006-12-15 Eduin Carrillo <yecarrillo@yahoo.com>
* lwgeom/: Makefile, lwgeom_kml.c, lwpostgis.sql.in:
New AsKML() function
* doc/postgis.xml: document new AsKML function.
2006-12-13 Markus Schaber <schabi@logix-tt.com>
* README.postgis
Fixed "hard upgrade" instructions.
--------- PostGIS-1.2.0 release [2006-12-08] --------------------------
2006-12-05 Mark Leslie <mleslie@refractions.net>
* doc/postgis.xml:
Added sections for the SQL-MM and ArcSDE function ports.
2006-12-05 Kevin Neufeld <kneufeld@refractions.net>
* Added sqlmm.sql.in: ESRI's ArcSDE subset of SQL/MM functions
* Moved common sql defines to their own header file.
2006-12-01 Mark Leslie <mleslie@refractions.net>
* lwgeom/lwcompound.c, lwgeom/lwcurve.c, lwgeom/lwmsurface.c,
lwgeom/lwmcurve.c, lwgeom/lwcurvepoly.c:
Added serialize/deserialize support for curved geometries.
* lwgeom/liblwgeom.h:
Added typedefs and minimum function prototypes for curved
geometries.
* lwgeom/lwgeom_sqlmm.c:
Functions to determine curve centers for use in creating bounding
boxs.
* lwgeom/wktunparse.c, lwgeom/lwgparse.c, lwgeom/wktparse.h,
lwgeom/wktparse.lex, lwgeom/wktparse.y:
Minimum parsing/printing support and struct allocations.
* lwgeom/liblwgeom.c, lwgeom/lwgeom_api.c, lwgeom/lwgeom.c:
Included curved types in various switches in generic functions.
* lwgeom/lwgeom_functions_analytic.c:
Added point-in-polygon function
* lwgeom/lwgeom_geos_c.c:
Added short-circuit for the point-in-polygon case to both Contains
and Within.
* lwgeom/Makefile:
Added new files to the makefile.
* regress/sql-mm-serialize.sql, regress/sql-mm-serialize_expected:
Created a regression test set for the serialization/deserialization
of the curved types.
* regress/Makefile:
Added the new regression test for curve serialization.
2006-11-29 Markus Schaber <schabi@logix-tt.com>
* Added java/jdbc/jtssrc/org/postgis/jts/JTSShape.java
2006-11-22 Markus Schaber <schabi@logix-tt.com>
* java/ejb3/src/org/postgis/hibernate/GeometryType.java
Added Nullpointer Fix by Norman Barker
2006-11-20 Sandro Santilli <strk@refractions.net>
* utils/postgis_restore.pl (canonicalize_typename):
canonicalize 'timezone .* time stamp' to 'timezone'
(fixes bug #121)
2006-11-17 "Antoine Bajolet" <antoine.bajolet@tdf.fr>
* lwgeom/lwgeom_gist.c: fixed 'directives may not be used inside a
macro argument' error raised by some compilers.
2006-11-10 Sandro Santilli <strk@refractions.net>
* configure.in (geos detection): use $geos_prefix/lib when
--ldflags is not supported by geos-config available.
2006-11-10 Havard Tveite <havard.tveite@nlh.no>
* doc/postgix.xml (Hard Upgrade): add info about createdb params
* utils/postgis_restore.pl: fix use of createdb params
2006-11-02 Sandro Santilli <strk@refractions.net>
* doc/postgis.xml: list setSRID bug fix in 'Bug fixes' section.
......
......@@ -4,13 +4,13 @@
#
#-----------------------------------------------------
all: Makefile.config liblwgeom loaderdumper utils
all: Makefile.config liblwgeom loaderdumper utils templategis
install: all liblwgeom-install loaderdumper-install
install: all liblwgeom-install loaderdumper-install templategis-install
uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall
uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall templategis-uninstall
clean: Makefile.config liblwgeom-clean loaderdumper-clean docs-clean test-clean
clean: Makefile.config liblwgeom-clean loaderdumper-clean docs-clean test-clean templategis-clean
rm -f lwpostgis.sql lwpostgis_upgrade.sql
distclean: clean
......@@ -59,6 +59,18 @@ loaderdumper-install:
loaderdumper-uninstall:
$(MAKE) -C loader uninstall
templategis: Makefile.config
$(MAKE) -C extras/template_gis
templategis-clean:
$(MAKE) -C extras/template_gis clean
templategis-install:
$(MAKE) -C extras/template_gis install
templategis-uninstall:
$(MAKE) -C extras/template_gis uninstall
docs: Makefile.config
$(MAKE) -C doc
......
PostGIS 1.2.1
2007/01/11
- Fix point-in-polygon shortcut bug in Within()
- Fix PgSQL 8.2 null handling for indexes
- Update RPM spec files
- Add AsKML() function
- Add short-circuit for transform() in no-op case
- JDBC: - Fixed JTS handling for multi-dimensional geometries
(thanks to Thomas Marti for hint and partial patch)
- Additionally, now JavaDoc is compiled and packaged
- Fixed classpath problems with GCJ
- Fixed pgjdbc 8.2 compatibility, losing support for
jdk 1.3 and older.
PostGIS 1.2.0
2006/12/08
- Added curved geometry type support for serialization/deserialization.
- Added point-in-polygon shortcircuit to Contains and Within functions.
- JDBC: Added awt.shape implementation for JTS geometries
- EJB3: Fixed NullPointer bug, thanks to Norman Barker
PostGIS 1.1.6
2006/11/02
......
PostGIS - Geographic Information Systems Extensions to PostgreSQL
~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
VERSION: 1.1.2 (2006/03/30)
VERSION: 1.2.1 (2007/01/11)
MORE INFORMATION: http://postgis.refractions.net
......@@ -11,25 +11,27 @@ spatial functions for accessing and analyzing geographic data.
Directory structure:
./ Build scripts and install directions.
./lwgeom Library source code.
./jdbc2 Extensions to the PostgreSQL JDBC drivers to support
the GIS objects.
./doc PostGIS Documentation
./loader A program to convert ESRI Shape files into SQL text
suitable for uploading into a PostGIS/PostgreSQL database
and a program for converting PostGIS spatial tables into
Shape files..
./utils Utility scripts for PostGIS (upgrade, profiling, ...)
./extras Various pieces that didn't belong to mainstream
(package management specfiles, WFS_locks, sample wkb parser)
./regress Regression tests
./ Build scripts and install directions.
./lwgeom Library source code.
./java/ejb EJB Java support
./java/jdbc Extensions to the PostgreSQL JDBC drivers to support
the GIS objects.
./java/pljava PostgreSQL PL/Java spatial object support
./doc PostGIS Documentation
./loader A program to convert ESRI Shape files into SQL text
suitable for uploading into a PostGIS/PostgreSQL database
and a program for converting PostGIS spatial tables into
Shape files.
./utils Utility scripts for PostGIS (upgrade, profiling, ...)
./extras Various pieces that didn't belong to mainstream
(package management specfiles, WFS_locks, sample wkb parser)
./regress Regression tests
REQUIREMENTS
------------
PostGIS is compatible with PostgreSQL 7.2 and above.
PostGIS is compatible with PostgreSQL 7.4 and above.
You *must* have full PostgreSQL - including server headers - installed
for this to work. Note that server headers are not installed by
......@@ -53,8 +55,8 @@ SEE THE NOTE ON GEOS SUPPORT BELOW FOR SPECIAL COMPILATION INSTRUCTIONS
http://geos.refractions.net
In order to use the GEOS support, you *may* need to specially compile
your version of PostgreSQL to link the C++ runtime library.
OLD NOTE: In order to use the GEOS support, you *may* need to
specially compile your version of PostgreSQL to link the C++ runtime library.
To do this, invoke the PgSQL configuration script this way:
LDFLAGS=-lstdc++ ./configure --your-options-go-here
......@@ -113,15 +115,15 @@ To install PostGIS library and utilities, as root run:
make install
Installation paths will tipically be derived by ``pg_config'':
Installation paths will typically be derived by ``pg_config'':
- Lib in `pg_config --pkglibdir`
- Binaries (loader/dumper) in `pg_config --bindir`
- Important support files in [prefix]/share/contrib
- Manpages in [prefix]/man
- Manual pages in [prefix]/man
- Documentation in in [prefix]/share/doc
Where [prefix] above is exctracted by `pg_config --configure`.
Where [prefix] above is extracted by `pg_config --configure`.
You can change them using ./configure switches.
See CONFIGURARION section.
......@@ -213,7 +215,7 @@ in "custom" format. The hard upgrade procedure is as follows:
# If you did make additions we assume you know how to backup them before
# upgrading the table. Replace it with the new like this:
$ psql newdb
newdb=> drop table spatial_ref_sys;
newdb=> DELETE FROM spatial_ref_sys;
DROP
newdb=> \i spatial_ref_sys.sql
......
2005/01/13
- Clean up mapserver connectivity
- Submit to OpenGIS Consortium for testing
- Network creation and network operations
(upstream, downstream, least cost path)
- Standardized handling for topology and coverages with
......
......@@ -4,6 +4,6 @@
# See HOWTO_RELEASE file in SVN for definitions of those three.
REL_MAJOR_VERSION=1
REL_MINOR_VERSION=1
REL_MICRO_VERSION=6
REL_MINOR_VERSION=2
REL_MICRO_VERSION=1
This diff is collapsed.
......@@ -147,7 +147,16 @@ AC_ARG_WITH(geos,
if test $USE_GEOS -gt 0; then
GEOS_DIR=`$GEOSCONFIG --prefix`
GEOS_LDFLAGS=`$GEOSCONFIG --ldflags`
GEOS_LDFLAGS=`$GEOSCONFIG --ldflags 2> /dev/null`
if test x"$GEOS_LDFLAGS" = "x"; then
# older geos-config versions did not
# support the --ldflags switch, we'll
# default to GEOS_DIR/lib in this case.
#
GEOS_LDFLAGS="-L${GEOS_DIR}/lib"
fi
GEOS_MAJOR=`$GEOSCONFIG --version | cut -d. -f1`
if test "$GEOS_MAJOR" = "@GEOS_VERSION@"; then
GEOS_MAJOR=1
......
postgis (1.2.1-1) unstable; urgency=low
* New upstream release.
-- Fabio Tranchitella <kobold@debian.org> Fri, 13 Apr 2007 09:19:18 +0200
postgis (1.1.6-2) unstable; urgency=low
* debian/README.Debian: added documentation for the new users on how to use
......
......@@ -37,7 +37,7 @@ Description: geographic objects support for PostgreSQL -- common files
Package: libpostgis-java
Architecture: all
Section: libs
Section: science
Depends: libpg-java
Suggests: postgresql-8.1-postgis | postgresql-7.4-postgis
Conflicts: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
--- configure.old 2006-12-25 14:39:26.000000000 +0200
+++ configure 2006-12-25 14:39:35.000000000 +0200
@@ -4609,13 +4609,6 @@
GEOS_DIR=`$GEOSCONFIG --prefix`
GEOS_LDFLAGS=`$GEOSCONFIG --ldflags 2> /dev/null`
- if test x"$GEOS_LDFLAGS" = "x"; then
- # older geos-config versions did not
- # support the --ldflags switch, we'll
- # default to GEOS_DIR/lib in this case.
- #
- GEOS_LDFLAGS="$GEOS_DIR/lib"
- fi
GEOS_MAJOR=`$GEOSCONFIG --version | cut -d. -f1`
if test "$GEOS_MAJOR" = "@GEOS_VERSION@"; then
--- java/jdbc/Makefile.old 2006-12-25 15:25:19.000000000 +0200
+++ java/jdbc/Makefile 2006-12-25 15:25:26.000000000 +0200
@@ -27,7 +27,7 @@
# Configure the helper executables used during build.
-JAVAC?=javac -target 1.2 -source 1.2
+JAVAC?=javac -target 1.5 -source 1.5
JAVA?=java
JAR?=jar
MKDIR?=mkdir -p
%define pg_version %(rpm -q --queryformat '%{VERSION}' postgresql-devel)
%{!?jdbc2:%define jdbc2 0}
%{!?utils:%define utils 1}
Summary: Geographic Information Systems Extensions to PostgreSQL
Name: postgis
Version: 1.1.2
Release: 1
License: GPL v2
Group: Applications/Databases
Source0: http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
Source2: postgis-jdbcdedectver.sh
Source4: filter-requires-perl-Pg.sh
Vendor: The PostGIS Project
URL: http://postgis.refractions.net/
BuildRequires: postgresql-devel,proj-devel, geos-devel >= 2.1.1
Requires: postgresql = %{pg_version} geos proj
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
%{!?javabuild:%define javabuild 1}
%{!?utils:%define utils 1}
%{!?gcj_support:%define gcj_support 1}
Summary: Geographic Information Systems Extensions to PostgreSQL
Name: postgis
Version: 1.2.0
Release: 2%{?dist}
License: GPL
Group: Applications/Databases
Source0: http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
Source4: filter-requires-perl-Pg.sh
Patch1: postgis-configure.patch
Patch2: postgis-javamakefile.patch
URL: http://postgis.refractions.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: postgresql-devel, proj-devel, geos-devel, byacc, proj-devel, flex, postgresql-jdbc
Requires: postgresql, geos, proj
%description
PostGIS adds support for geographic objects to the PostgreSQL object-relational
database. In effect, PostGIS "spatially enables" the PostgreSQL server,
allowing it to be used as a backend spatial database for geographic information
systems (GIS), much like ESRI's SDE or Oracle's Spatial extension. PostGIS
follows the OpenGIS "Simple Features Specification for SQL" and will be
submitted for conformance testing at version 1.0.
%if %jdbc2
%package jdbc2
Summary: The JDBC2 driver for PostGIS
Group: Applications/Interfaces
Provides: %{name}_%{version}.jar
Requires: postgis
%description jdbc2
The postgis-jdbc2 package provides the essential jdbc2 driver for PostGIS.
systems (GIS), much like ESRI's SDE or Oracle's Spatial extension. PostGIS
follows the OpenGIS "Simple Features Specification for SQL" and has been
certified as compliant with the "Types and Functions" profile.
%if %javabuild
%package jdbc
Summary: The JDBC driver for PostGIS
Group: Applications/Databases
License: LGPL
Requires: postgis
BuildRequires: ant >= 0:1.6.2, junit >= 0:3.7
%if %{gcj_support}
BuildRequires: gcc-java
Requires(post): java-1.4.2-gcj-compat
Requires(postun): java-1.4.2-gcj-compat
%endif
%description jdbc
The postgis-jdbc package provides the essential jdbc driver for PostGIS.
%endif
%if %utils
%package utils
Summary: The utils for PostGIS
Group: Applications/Interfaces
Requires: postgis, perl-DBD-Pg
Summary: The utils for PostGIS
Group: Applications/Databases
Requires: postgis, perl-DBD-Pg
%description utils
The postgis-utils package provides the utilities for PostGIS.
%endif
%define __perl_requires %{SOURCE4}
%prep
%setup -q
%patch1 -p0
%patch2 -p0
%build
make %{?_smp_mflags} PGXS=1 PGSQL_SRC=/usr/lib/pgsql/pgxs LPATH=\$\(pkglibdir\) shlib="%{name}.so" 'CFLAGS=-Wno-pointer-sign '
%if %jdbc2
export MAKEFILE_DIR=/usr/src/redhat/BUILD/%{name}-%{version}/jdbc2
sh %{SOURCE2}
make -C jdbc2
%configure
make %{?_smp_mflags} LPATH=`pg_config --pkglibdir` shlib="%{name}.so"
%if %javabuild
export MAKEFILE_DIR=%{_builddir}/%{name}-%{version}/java/jdbc
JDBC_VERSION_RPM=`rpm -ql postgresql-jdbc| grep 'jdbc.jar$'|awk -F '/' '{print $5}'`
sed 's/postgresql.jar/'${JDBC_VERSION_RPM}'/g' $MAKEFILE_DIR/Makefile > $MAKEFILE_DIR/Makefile.new
mv -f $MAKEFILE_DIR/Makefile.new $MAKEFILE_DIR/Makefile
make -C java/jdbc
%endif
%if %utils
make -C utils
%endif
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PGXS=1 PGSQL_SRC=/usr/lib/pgsql/pgxs
install lwgeom/%{name}.so $RPM_BUILD_ROOT%{_libdir}/pgsql
#install -d $RPM_BUILD_ROOT/usr/share/pgsql/postgresql/contrib/
#install -m 755 *.sql $RPM_BUILD_ROOT/usr/share/pgsql/postgresql/contrib/
install -d $RPM_BUILD_ROOT/usr/share/pgsql/contrib/
install -m 755 *.sql $RPM_BUILD_ROOT/usr/share/pgsql/contrib/
%if %jdbc2
# JDBC2
# Red Hat's standard place to put jarfiles is /usr/share/java
install -d $RPM_BUILD_ROOT/usr/share/java
install -m 755 jdbc2/%{name}_%{version}.jar $RPM_BUILD_ROOT/usr/share/java
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install -d %{buildroot}%{_libdir}/pgsql/
install lwgeom/liblwgeom.so* %{buildroot}%{_libdir}/pgsql/
install -d %{buildroot}%{_datadir}/pgsql/contrib/
install -m 644 *.sql %{buildroot}%{_datadir}/pgsql/contrib/
rm -f %{buildroot}%{_libdir}/liblwgeom.so*
rm -f %{buildroot}%{_datadir}/*.sql
%if %javabuild
install -d %{buildroot}%{_javadir}
install -m 755 java/jdbc/%{name}_%{version}.jar %{buildroot}%{_javadir}
%if %{gcj_support}
aot-compile-rpm
%endif
%endif
strip %{buildroot}/%{_libdir}/gcj/%{name}/*.jar.so
%if %utils
install -d $RPM_BUILD_ROOT/usr/bin
install -m 755 utils/*.pl $RPM_BUILD_ROOT/usr/bin
install -d %{buildroot}%{_datadir}/%{name}
install -m 644 utils/*.pl %{buildroot}%{_datadir}/%{name}
%endif
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{buildroot}
%post -p %{_bindir}/rebuild-gcj-db
%postun -p %{_bindir}/rebuild-gcj-db
%files
%defattr(644,root,root,755)
%doc NEWS CREDITS README.postgis TODO doc/html loader/README.* *.sql doc/postgis.xml doc/ZMSgeoms.txt
%defattr(-,root,root)
%doc COPYING CREDITS NEWS TODO README.%{name} TODO doc/html loader/README.* doc/%{name}.xml doc/ZMSgeoms.txt
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_libdir}/pgsql/*.so*
#%attr(755,root,root) %{_mandir}/man1/*
%attr(755,root,root) /usr/share/pgsql/contrib/*
%if %jdbc2
%files jdbc2
%defattr(644,root,root,755)
%attr(755,root,root) /usr/share/java/%{name}_%{version}.jar
%attr(755,root,root) %{_libdir}/pgsql/liblwgeom.so*
%{_datadir}/pgsql/contrib/*.sql
%if %javabuild
%files jdbc
%defattr(-,root,root)
%doc java/jdbc/COPYING_LGPL java/jdbc/README
%attr(755,root,root) %{_javadir}/%{name}_%{version}.jar
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/*.jar.so
%{_libdir}/gcj/%{name}/*.jar.db
%endif
%endif
%if %utils
%files utils
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/create_undef.pl
%attr(755,root,root) %{_bindir}/test_estimation.pl
%attr(755,root,root) %{_bindir}/test_joinestimation.pl
%attr(755,root,root) %{_bindir}/postgis_restore.pl
%attr(755,root,root) %{_bindir}/profile_intersects.pl
%defattr(-,root,root)
%doc utils/README
%attr(755,root,root) %{_datadir}/%{name}/test_estimation.pl
%attr(755,root,root) %{_datadir}/%{name}/profile_intersects.pl
%attr(755,root,root) %{_datadir}/%{name}/test_joinestimation.pl
%attr(644,root,root) %{_datadir}/%{name}/create_undef.pl
%attr(644,root,root) %{_datadir}/%{name}/%{name}_proc_upgrade.pl
%attr(644,root,root) %{_datadir}/%{name}/%{name}_restore.pl
%endif
%changelog
* Thu May 11 2006 - Laurent WANDREBECK <lw@hygeos.com> 1.1.2-1
- update to 1.1.2
* Mon Dec 26 2006 - Devrim GUNDUZ <devrim@commandprompt.com> 1.2.0-2
- More spec file fixes per bugzilla review #220743
* Mon Dec 25 2006 - Devrim GUNDUZ <devrim@commandprompt.com> 1.2.0-1
- Initial submission for Fedora Core Extras
- Spec file changes and fixes per FC Extras packaging guidelines
* Fri Jun 23 2006 - Devrim GUNDUZ <devrim@commandprompt.com> 1.1.2-2
- Update to 1.1.2
* Tue Dec 22 2005 - Devrim GUNDUZ <devrim@commandprompt.com> 1.1.0-2
- Final fixes for 1.1.0
......@@ -126,23 +160,23 @@ rm -rf $RPM_BUILD_ROOT
* Mon Oct 03 2005 - Devrim GUNDUZ <devrim@gunduz.org>
- Make PostGIS build against pgxs so that we don't need PostgreSQL sources.
- Fixed all build errors except jdbc (so, defaulted to 0)
- Added new files under %utils
- Added new files under %%utils
- Removed postgis-jdbc2-makefile.patch (applied to -head)
* Tue Sep 27 2005 - Devrim GUNDUZ <devrim@gunduz.org>
- Update to 1.0.4
* Sun Apr 20 2005 - Devrim GUNDUZ <devrim@gunuz.org>
* Sun Apr 20 2005 - Devrim GUNDUZ <devrim@gunduz.org>
- 1.0.0 Gold
* Sun Apr 17 2005 - Devrim GUNDUZ <devrim@gunuz.org>
* Sun Apr 17 2005 - Devrim GUNDUZ <devrim@gunduz.org>
- Modified the spec file so that we can build JDBC2 RPMs...
- Added -utils RPM to package list.
* Fri Apr 15 2005 - Devrim GUNDUZ <devrim@gunuz.org>
* Fri Apr 15 2005 - Devrim GUNDUZ <devrim@gunduz.org>
- Added preun and postun scripts.
* Sat Apr 09 2005 - Devrim GUNDUZ <devrim@gunuz.org>
* Sat Apr 09 2005 - Devrim GUNDUZ <devrim@gunduz.org>
- Initial RPM build
- Fixed libdir so that PostgreSQL installations will not complain about it.
- Enabled --with-geos and modified the old spec.
......@@ -23,6 +23,14 @@ SCRIPT_DOLINK=rm -f $(SCRIPT_LINK); \
$(LN_S) $(SCRIPT_TARGET) $(SCRIPT_LINKDIR)
SCRIPT_UNINSTALL=rm -f $(SCRIPT_TARGET)
SCRIPT_UNLINK=rm -f $(SCRIPT_LINK)
# would probably be nice to link these somewhere as well
MANPAGES1:=$(wildcard *.1)
MAN1_TARGETDIR=$(DESTDIR)$(mandir)/man1
MAN1_TARGET=$(MAN1_TARGETDIR)/$(MAN1)
MAN1_INSTALL=$(INSTALL_DATA) $(MAN1) $(MAN1_TARGET)
MAN1_UNINSTALL=rm -f $(MAN1_TARGET)
DEFAULTS_DIR=$(DESTDIR)/etc/default
SCRIPT_DEFAULTS=$(DEFAULTS_DIR)/postgis
......@@ -37,10 +45,13 @@ install: all
@mkdir -p $(DEFAULTS_DIR)
cp profile $(SCRIPT_DEFAULTS)
rm -f $(SCRIPT_TARGETDIR)/profile
@mkdir -p $(MAN1_TARGETDIR)
$(foreach MAN1, $(MANPAGES1), $(MAN1_INSTALL);)
uninstall:
$(foreach SCRIPT, $(PUBLIC_SCRIPTS), $(SCRIPT_UNLINK);)
$(foreach SCRIPT, $(SCRIPTS), $(SCRIPT_UNINSTALL);)
$(foreach MAN1, $(MANPAGES1), $(MAN1_UNINSTALL);)
purge: uninstall
rm -f $(SCRIPT_DEFAULTS)
......
......@@ -19,7 +19,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
* http://www.gnu.org.
*
* $Id: GeometryType.java 2501 2006-10-09 17:22:15Z mschaber $
* $Id: GeometryType.java 2531 2006-11-22 10:42:17Z mschaber $
*/
package org.postgis.hibernate;
......@@ -86,11 +86,13 @@ public class GeometryType implements UserType {
*/
public Object nullSafeGet(ResultSet resultSet,
String[] names, Object owner) throws HibernateException, SQLException {
Geometry result = null;
String geom = resultSet.getString(names[0]);
BinaryParser parser = new BinaryParser();
result = parser.parse(geom);
return result;
Geometry result = null;
String geom = resultSet.getString(names[0]);
if(geom != null ) {
BinaryParser parser = new BinaryParser();
result = parser.parse(geom);
}
return result;
}
/**
......
......@@ -82,22 +82,25 @@ PGPASS?=guess
PGURL?=//$(PGHOST):$(PGPORT)/$(PGDATABASE)
# Where to put the output from regression tests. If you want to have it on
# stdout, set TESTOUT to the empty string. Be careful - this will be deleted
# by "make clean".
# stdout, set TESTRD to the empty string. If you want to have it in another
# file, set TESTOUTPUT to the file path.
# Be careful - that file will be deleted by "make clean".
TESTOUTPUT?=test.log
# Output redirect for tests
TESTRD?= >>$(TESTOUTPUT)
### Config variable section ends ###
# build internal constants follow:
SRCDIR=src
SRCDIR=./src
EXAMPLES=examples
BUILD=bin
BUILD=./bin
RUNCP=$(POSTGIS_BUILD_CLASSPATH)$(CPSEP)./postgis.jar
BUILDCP=