rpms/postgis/F-7 postgis.spec,1.7,1.8

[Devrim GÜNDÜZ (devrim)]

Author: devrim

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

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/F-7/postgis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- postgis.spec	6 Dec 2007 23:47:38 -0000	1.7
+++ postgis.spec	5 Jan 2008 11:19:35 -0000	1.8
@@ -5,17 +5,16 @@
 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
+BuildRequires:	postgresql-devel, proj-devel, geos-devel, byacc, proj-devel, flex, sinjdoc, java, java-devel, ant
+
 Requires:	postgresql, geos, proj
 
 %description
@@ -36,8 +35,8 @@
 
 %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
@@ -58,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
@@ -146,8 +144,17 @@
 %endif
 
 %changelog
+* 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