rpms/postgis/devel postgis-gnumakefile.patch, NONE, 1.1 postgis-jdbcmakefile.patch, NONE, 1.1 postgis.spec, 1.3, 1.4 postgis-configure.patch, 1.1, NONE postgis-javamakefile.patch, 1.1, NONE

[Devrim GÜNDÜZ (devrim)]

Author: devrim

Update of /cvs/extras/rpms/postgis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5944

Modified Files:
	postgis.spec 
Added Files:
	postgis-gnumakefile.patch postgis-jdbcmakefile.patch 
Removed Files:
	postgis-configure.patch postgis-javamakefile.patch 
Log Message:
ADd postgis to devel


postgis-gnumakefile.patch:

--- NEW FILE postgis-gnumakefile.patch ---
--- GNUmakefile.old	2007-07-02 17:13:05.000000000 +0300
+++ GNUmakefile	2007-07-02 17:13:59.000000000 +0300
@@ -4,13 +4,13 @@
 #
 #-----------------------------------------------------
 
-all: Makefile.config liblwgeom loaderdumper utils templategis
+all: Makefile.config liblwgeom loaderdumper utils
 
-install: all liblwgeom-install loaderdumper-install templategis-install
+install: all liblwgeom-install loaderdumper-install
 
-uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall templategis-uninstall
+uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall
 
-clean: Makefile.config liblwgeom-clean loaderdumper-clean docs-clean test-clean templategis-clean
+clean: Makefile.config liblwgeom-clean loaderdumper-clean docs-clean test-clean
 	rm -f lwpostgis.sql lwpostgis_upgrade.sql
 
 distclean: clean
@@ -59,18 +59,6 @@
 loaderdumper-uninstall:
 	$(MAKE) -C loader uninstall
 
-templategis: Makefile.config
-	$(MAKE) -C extras/template_gis
-
-templategis-clean:
-	$(MAKE) -C extras/template_gis clean
-
-templategis-install:
-	$(MAKE) -C extras/template_gis install
-
-templategis-uninstall:
-	$(MAKE) -C extras/template_gis uninstall
-
 docs: Makefile.config
 	$(MAKE) -C doc 
 

postgis-jdbcmakefile.patch:

--- NEW FILE postgis-jdbcmakefile.patch ---
--- java/jdbc/Makefile.old	2007-01-08 12:12:01.000000000 +0200
+++ java/jdbc/Makefile	2007-06-26 21:41:57.000000000 +0300
@@ -27,7 +27,7 @@
 
 # Configure the helper executables used during build.
 
-JAVAC?=javac -target 1.2 -source 1.2
+JAVAC?=javac -target 1.5 -source 1.5
 JAVA?=java
 JAR?=jar
 MKDIR?=mkdir -p
@@ -249,9 +249,11 @@
 postgis-jdbc-javadoc.zip: javadoc-build
 	$(JAR) -cf postgis-jdbc-javadoc.zip -C javadoc-build .
 
-javadoc-build: jtscompile compile
+javadoc-build:
 	$(MKDIR) javadoc-build
-	javadoc -d javadoc-build -sourcepath src:jtssrc \
+	# We use an ugly trick to build on windows and unix - 
+	# javadoc command line options are not portable wr/t path separators
+	javadoc -d javadoc-build -sourcepath "src:jtssrc:;src;jtssrc" \
 		org.postgis org.postgis.jts org.postgis.binary org.postgis.java2d examples
 
 # Preliminary JTS support


Index: postgis.spec
===================================================================
RCS file: /cvs/extras/rpms/postgis/devel/postgis.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postgis.spec	3 Jul 2007 06:41:57 -0000	1.3
+++ postgis.spec	5 Jul 2007 13:20:02 -0000	1.4
@@ -5,13 +5,13 @@
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
 Version:	1.2.1
-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-jdbc-makefile.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)
 
@@ -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
@@ -115,7 +115,7 @@
 
 %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*
@@ -146,10 +146,13 @@
 %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
-- Added postgresql-jdb as as dependency to -jdbc package, per Guillaume
 - 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
 


--- postgis-configure.patch DELETED ---


--- postgis-javamakefile.patch DELETED ---