[mapserver/f17] Merged from 6.0.3-4

[Pavel Lisý]

commit 975ed7178907e54b0bd5609b383dfb0afa835b9d
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Mon Oct 15 13:34:39 2012 +0200

    Merged from 6.0.3-4
    
    - fix of build for php4 and swig > 2.0.4

 .gitignore     |    2 ++
 mapserver.spec |   19 ++++++++++++++++---
 sources        |    3 ++-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86e2b21..05168f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /mapserver-6.0.3.tar.gz
+/mapserver-6.0.3-for-swig_2.0.4_up.patch
+/mapserver-6.0.3-php4.patch
diff --git a/mapserver.spec b/mapserver.spec
index 4026458..d6e36e2 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -1,11 +1,15 @@
 Name:           mapserver
 Version:        6.0.3
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.mapserver.org
 Source:         http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
+
+Patch0:         mapserver-6.0.3-for-swig_2.0.4_up.patch
+Patch1:         mapserver-6.0.3-php4.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd
 Requires:       bitstream-vera-sans-fonts
@@ -70,6 +74,11 @@ within the Java programming language.
 
 %prep
 %setup -q
+%if "%{fedora}" == "17" || "%{fedora}" == "18"  || "%{fedora}" == "19"
+%patch0 -p1 -b .swig
+%patch1 -p1 -b .php4
+%endif
+
 # fix spurious perm bits
 chmod -x tests/home.png
 chmod -x mapscript/php/php_mapscript.c
@@ -157,8 +166,8 @@ python setup.py build
 
 # build java
 cd ../java
-make interface
-make
+make interface JAVA_HOME=/etc/alternatives/java_sdk
+make JAVA_HOME=/etc/alternatives/java_sdk
 
 %install
 rm -rf %{buildroot}
@@ -248,6 +257,10 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Fri Oct 12 2012 Pavel Lisý <pali at fedoraproject.org> - 6.0.3-5
+- Merged from 6.0.3-4
+- fix of build for php4 and swig > 2.0.4
+
 * Sat Jun 30 2012 Devrim GÜNDÜZ <devrim at gunduz.org> - 6.0.3-1
 - Update to 6.0.3, for various fixes described at:
   https://github.com/mapserver/mapserver/blob/rel-6-0-3-0/HISTORY.TXT
diff --git a/sources b/sources
index 79eab88..89b7252 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-0d2ad6f56e8a1b5755e856a54f90071c  mapserver-6.0.3.tar.gz
+dc97d83d30f6977e9d2adb26ee70ace4  mapserver-6.0.3-for-swig_2.0.4_up.patch
+035a14531f3c100ff7031e212b2b3f38  mapserver-6.0.3-php4.patch