rpms/postgis/EL-5 postgis.spec,1.10,1.11

[Devrim GÜNDÜZ (devrim)]

Author: devrim

Update of /cvs/extras/rpms/postgis/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2787/EL-5

Modified Files:
	postgis.spec 
Log Message:
- Various fixes from Mark Cave-Ayland
- Removed patch2: template_gis is no longer built by default.
- Removed patch0: Building the JDBC driver using make is now deprecated
- Build JDBC driver using ant, rather than make.




Index: postgis.spec
===================================================================
RCS file: /cvs/extras/rpms/postgis/EL-5/postgis.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- postgis.spec	8 Dec 2007 10:49:06 -0000	1.10
+++ postgis.spec	5 Jan 2008 11:19:27 -0000	1.11
@@ -1,25 +1,21 @@
-%{!?javabuild:%define	javabuild 0}
+%{!?javabuild:%define	javabuild 1}
 %{!?utils:%define	utils 1}
-%{!?gcj_support:%define	gcj_support 0}
+%{!?gcj_support:%define	gcj_support 1}
 
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
 Version:	1.3.2
-Release:	1%{?dist}
+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-gnumakefile.patch
-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
-Requires:	postgresql, geos, proj
+BuildRequires:	postgresql-devel, proj-devel, geos-devel, byacc, proj-devel, flex, sinjdoc, java, java-devel, ant
 
-# Obsoleted temporarily until upstream comes with a better fix.
-Obsoletes:	postgis-jdbc < 1.3.1
+Requires:	postgresql, geos, proj
 
 %description
 PostGIS adds support for geographic objects to the PostgreSQL object-relational
@@ -35,12 +31,12 @@
 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
-Requires(post):		java-1.4.2-gcj-compat
-Requires(postun):	java-1.4.2-gcj-compat
+Requires(post):		%{_bindir}/rebuild-gcj-db
+Requires(postun):	%{_bindir}/rebuild-gcj-db
 %endif
 
 %description jdbc
@@ -61,20 +57,19 @@
 
 %prep
 %setup -q
-%patch1 -p0
-#Â To be removed in 1.2.2
-%patch2 -p0
 
 %build
 %configure 
 make %{?_smp_mflags} LPATH=`pg_config --pkglibdir` shlib="%{name}.so"
 
 %if %javabuild
-export MAKEFILE_DIR=%{_builddir}/%{name}-%{version}/java/jdbc
+export BUILDXML_DIR=%{_builddir}/%{name}-%{version}/java/jdbc
 JDBC_VERSION_RPM=`rpm -ql postgresql-jdbc| grep 'jdbc2.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
+sed 's/postgresql.jar/'${JDBC_VERSION_RPM}'/g' $BUILDXML_DIR/build.xml > $BUILDXML_DIR/build.xml.new
+mv -f $BUILDXML_DIR/build.xml.new $BUILDXML_DIR/build.xml
+pushd java/jdbc
+ant
+popd
 %endif
 
 %if %utils
@@ -149,13 +144,22 @@
 %endif
 
 %changelog
-* Sat Dec 8 2007 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.2-1
+* Sat Jan 5 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.2-2
+- Various fixes from Mark Cave-Ayland
+- Removed patch2: template_gis is no longer built by default.
+- Removed patch0: Building the JDBC driver using make is now deprecated
+- Build JDBC driver using ant, rather than make.
+
+* Thu Dec 6 2007 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.2-1
 - Update to 1.3.2
+- Updated patch2
+
+* Wed Nov 21 2007 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.1-2
+- Move postgresql-jdbc dependency to the correct place, per Rob Nagler.
 
 * Tue Oct 16 2007 Devrim GUNDUZ <devrim at commandprompt.com> - 1.3.1-1
 - Update to 1.3.1
 - Updated patch2
-- Obsoleted -jdbc package until upstream comes with a fix
 
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.1-3
 - Rebuild for selinux ppc32 issue.