rpms/postgis/FC-6 postgis.spec,1.1,1.2

[Devrim GÜNDÜZ (devrim)]

Author: devrim

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

Modified Files:
	postgis.spec 
Log Message:
- Added postgis.so among installed packages, per Jon Burgess.
- Fix jdbc jar dedection problem




Index: postgis.spec
===================================================================
RCS file: /cvs/extras/rpms/postgis/FC-6/postgis.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgis.spec	27 Dec 2006 21:42:37 -0000	1.1
+++ postgis.spec	3 Jan 2007 00:33:53 -0000	1.2
@@ -5,7 +5,7 @@
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
 Version:	1.2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Databases
 Source0:	http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
@@ -58,6 +58,7 @@
 
 %prep
 %setup -q
+#Â To be removed in 1.2.1
 %patch1 -p0
 %patch2 -p0
 
@@ -67,7 +68,7 @@
 
 %if %javabuild
 export MAKEFILE_DIR=%{_builddir}/%{name}-%{version}/java/jdbc
-JDBC_VERSION_RPM=`rpm -ql postgresql-jdbc| grep 'jdbc.jar$'|awk -F '/' '{print $5}'`
+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
@@ -82,6 +83,7 @@
 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*
@@ -113,6 +115,7 @@
 %defattr(-,root,root)
 %doc COPYING CREDITS NEWS TODO README.%{name} TODO 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*
 %{_datadir}/pgsql/contrib/*.sql
 
@@ -141,6 +144,10 @@
 %endif
 
 %changelog
+* Wed Jan 3 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.0-4
+- Added postgis.so among installed packages, per Jon Burgess.
+- Fix jdbc jar dedection problem
+
 * Wed Dec 27 2006 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.0-3
 - Fix Requires for subpackages per bugzilla review #220743