rpms/postgis/FC-6 postgis.spec,1.3,1.4

[Devrim GÜNDÜZ (devrim)]

Author: devrim

Update of /cvs/extras/rpms/postgis/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13097

Modified Files:
	postgis.spec 
Log Message:
 Update to 1.2.1 
 Fix build problems (removed template_gis, per discussion with upsteam).
 Removed configure patch (it is in the upstream now)
 Added postgresql-jdbc as as dependency to -jdbc package, per Guillaume
 move strip to correct place, per Guillaume
 Fix long-standing post/postun problem, per Guillaume




Index: postgis.spec
===================================================================
RCS file: /cvs/extras/rpms/postgis/FC-6/postgis.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postgis.spec	3 Jan 2007 01:14:00 -0000	1.3
+++ postgis.spec	3 Jul 2007 06:03:19 -0000	1.4
@@ -4,14 +4,14 @@
 
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
-Version:	1.2.0
-Release:	4%{?dist}
+Version:	1.2.1
+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
+Patch1:		postgis-gnumakefile.patch
+Patch2:		postgis-jdbcmakefile.patch
 URL:		http://postgis.refractions.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,7 +31,7 @@
 Summary:	The JDBC driver for PostGIS
 Group:		Applications/Databases
 License:	LGPL
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}, postgresql-jdbc
 BuildRequires:  ant >= 0:1.6.2, junit >= 0:3.7
 
 %if %{gcj_support}
@@ -58,8 +58,8 @@
 
 %prep
 %setup -q
-#Â To be removed in 1.2.1
 %patch1 -p0
+#Â To be removed in 1.2.2
 %patch2 -p0
 
 %build
@@ -95,9 +95,8 @@
 %if %{gcj_support}
 aot-compile-rpm
 %endif
-%endif
-
 strip %{buildroot}/%{_libdir}/gcj/%{name}/*.jar.so
+%endif
 
 %if %utils
 install -d %{buildroot}%{_datadir}/%{name}
@@ -107,13 +106,16 @@
 %clean
 rm -rf %{buildroot}
 
+%if %javabuild
+%if %gcj_support
 %post -p %{_bindir}/rebuild-gcj-db
-
 %postun -p %{_bindir}/rebuild-gcj-db
+%endif
+%endif
 
 %files
 %defattr(-,root,root)
-%doc COPYING CREDITS NEWS TODO README.%{name} TODO doc/html loader/README.* doc/%{name}.xml  doc/ZMSgeoms.txt 
+%doc COPYING CREDITS NEWS TODO README.%{name} doc/html loader/README.* doc/%{name}.xml  doc/ZMSgeoms.txt 
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/pgsql/postgis.so*
 %attr(755,root,root) %{_libdir}/pgsql/liblwgeom.so*
@@ -144,6 +146,16 @@
 %endif
 
 %changelog
+* Mon Jul 2 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.1-2
+- Fix build problems (removed template_gis, per discussion with upsteam).
+
+* Mon Feb 19 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.1-1
+- Update to 1.2.1
+- Removed configure patch (it is in the upstream now)
+- Added postgresql-jdbc as as dependency to -jdbc package, per Guillaume
+- move strip to correct place, per Guillaume
+- Fix long-standing post/postun problem, per Guillaume
+
 * Wed Jan 3 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.0-4
 - Added postgis.so among installed files, per Jon Burgess.
 - Fix jdbc jar dedection problem