From 54ac7f120e3b7e1e4d7970ace49f21c4e61f2ee0 Mon Sep 17 00:00:00 2001
From: Devrim GÜNDÜZ <devrim@fedoraproject.org>
Date: Jul 06 2009 04:22:12 +0000
Subject: Update to 1.4rc1


---

diff --git a/.cvsignore b/.cvsignore
index c9f470a..fe79473 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-postgis-1.3.6.tar.gz
-postgis-1.3.6.pdf
+postgis-1.4.0rc1.tar.gz
+postgis-1.4.0rc1.pdf
diff --git a/postgis.spec b/postgis.spec
index f2cfa50..c833e6d 100644
--- a/postgis.spec
+++ b/postgis.spec
@@ -4,19 +4,21 @@
 
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
-Version:	1.3.6
-Release:	2%{?dist}
+Version:	1.4.0rc1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Databases
 Source0:	http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
 Source2:	http://www.postgis.org/download/%{name}-%{version}.pdf
 Source4:	filter-requires-perl-Pg.sh
+# 1.4rc1 only patch.
+Patch0:		postgis-loader-makefile.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, sinjdoc, java, java-devel, ant
+BuildRequires:	postgresql-devel >= 8.2, proj-devel, geos-devel >= 3.1.1, byacc, proj-devel, flex, sinjdoc, java, java-devel, ant
 
-Requires:	postgresql, geos, proj
+Requires:	postgresql >= 8.2, geos >= 3.1.1, proj
 
 %description
 PostGIS adds support for geographic objects to the PostgreSQL object-relational
@@ -65,6 +67,7 @@ The postgis-utils package provides the utilities for PostGIS.
 
 %prep
 %setup -q
+%patch0 -p0
 # Copy .pdf file to top directory before installing.
 cp -p %{SOURCE2} .
 
@@ -90,11 +93,8 @@ popd
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 install -d %{buildroot}%{_libdir}/pgsql/
-install lwgeom/liblwgeom.so* %{buildroot}%{_libdir}/pgsql/
-install lwgeom/postgis.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 [ "%{_libdir}" = "/usr/lib64" ] ; then
@@ -104,7 +104,7 @@ fi
 
 %if %javabuild
 install -d %{buildroot}%{_javadir}
-install -m 755 java/jdbc/%{name}_%{version}.jar %{buildroot}%{_javadir}
+install -m 755 java/jdbc/%{name}-%{version}.jar %{buildroot}%{_javadir}
 %if %{gcj_support}
 aot-compile-rpm
 %endif
@@ -128,17 +128,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc COPYING CREDITS NEWS TODO README.%{name} 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*
+%attr(755,root,root) %{_libdir}/pgsql/postgis-*.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
+%attr(755,root,root) %{_javadir}/%{name}-%{version}.jar
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/*.jar.so
@@ -157,6 +156,7 @@ rm -rf %{buildroot}
 %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
+%attr(644,root,root) %{_datadir}/%{name}/new_postgis_restore.pl
 %endif
 
 %files docs
@@ -164,6 +164,10 @@ rm -rf %{buildroot}
 %doc postgis*.pdf
 
 %changelog
+* Mon Jul 6 2009 Devrim GUNDUZ <devrim@gunduz.org> - 1.4.0rc1-1
+- Update to 1.4.0rc1
+- Fix spec for 1.4
+
 * Thu Jun 18 2009 Devrim GUNDUZ <devrim@commandprompt.com> - 1.3.6-2
 - Add a new subpackage: -docs, and add postgis pdf file to it.
 - Own /usr/share/postgis, per bugzilla #474686
diff --git a/sources b/sources
index bef5ce0..1b8af52 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-da590f0e485335e9cdaeb66c3d68aa24  postgis-1.3.6.tar.gz
-1233c771906d6cdfa06d7fe19dcd1b39  postgis-1.3.6.pdf
+f380bfdb29792f712662ab53967f4652  postgis-1.4.0rc1.tar.gz
+855f97c92d95ceee78314d544bbd6f4c  postgis-1.4.0rc1.pdf