From 282b7059bcfcfc10cecafc78d7ca82250ba28f16 Mon Sep 17 00:00:00 2001 From: Devrim GÜNDÜZ Date: Dec 06 2007 23:47:41 +0000 Subject: Update to 1.3.2 --- diff --git a/.cvsignore b/.cvsignore index bd8f6e1..26cc16e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -postgis-1.3.1.tar.gz +postgis-1.3.2.tar.gz diff --git a/postgis-jdbcmakefile.patch b/postgis-jdbcmakefile.patch index 7de232c..498bdc0 100644 --- a/postgis-jdbcmakefile.patch +++ b/postgis-jdbcmakefile.patch @@ -1,11 +1,23 @@ ---- java/jdbc/Makefile.old 2007-10-16 11:16:53.000000000 -0700 -+++ java/jdbc/Makefile 2007-10-16 11:17:00.000000000 -0700 -@@ -27,7 +27,7 @@ +--- java/jdbc/Makefile.old 2007-12-06 15:18:04.000000000 -0800 ++++ java/jdbc/Makefile 2007-12-06 15:22:19.000000000 -0800 +@@ -27,9 +27,9 @@ # Configure the helper executables used during build. -JAVAC?=javac -target 1.2 -source 1.2 -+JAVAC?=javac -target 1.5 -source 1.5 ++JAVAC?=ecj -target 1.5 -source 1.5 JAVA?=java - JAR?=jar +-JAR?=jar ++JAR?=fastjar MKDIR?=mkdir -p + DELETE?=rm -rvf + CP?=cp +@@ -264,7 +264,7 @@ + $(MKDIR) javadoc-build + # We use an ugly trick to build on windows and unix - + # javadoc command line options are not portable wr/t path separators +- javadoc -d javadoc-build -sourcepath "src:jtssrc:;src;jtssrc" \ ++ sinjdoc -d javadoc-build -sourcepath "src:jtssrc:;src;jtssrc" \ + org.postgis org.postgis.jts org.postgis.binary org.postgis.java2d examples + + # Preliminary JTS support diff --git a/postgis.spec b/postgis.spec index fb01502..2e4bee3 100644 --- a/postgis.spec +++ b/postgis.spec @@ -4,7 +4,7 @@ Summary: Geographic Information Systems Extensions to PostgreSQL Name: postgis -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} License: GPL Group: Applications/Databases @@ -15,7 +15,8 @@ Patch2: postgis-jdbcmakefile.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 +BuildRequires: postgresql-devel, proj-devel, geos-devel, byacc, proj-devel, flex, sinjdoc, eclipse-ecj, libgcj + Requires: postgresql, geos, proj %description @@ -32,7 +33,7 @@ Summary: The JDBC driver for PostGIS Group: Applications/Databases License: LGPL Requires: %{name} = %{version}-%{release}, postgresql-jdbc -BuildRequires: ant >= 0:1.6.2, junit >= 0:3.7 +BuildRequires: ant >= 0:1.6.2, junit >= 0:3.7, postgresql-jdbc %if %{gcj_support} BuildRequires: gcc-java @@ -146,6 +147,13 @@ rm -rf %{buildroot} %endif %changelog +* Thu Dec 6 2007 Devrim GUNDUZ - 1.3.2-1 +- Update to 1.3.2 +- Updated patch2 + +* Wed Nov 21 2007 Devrim GUNDUZ - 1.3.1-2 +- Move postgresql-jdbc dependency to the correct place, per Rob Nagler. + * Tue Oct 16 2007 Devrim GUNDUZ - 1.3.1-1 - Update to 1.3.1 - Updated patch2 diff --git a/sources b/sources index 8f4095f..d0a7b18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd90f80072fc3e32d3a3eb580542bda1 postgis-1.3.1.tar.gz +b0d52c2c23c316fc9884632a80b380a5 postgis-1.3.2.tar.gz