fixed build for 11.1, updated

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=32

mapserver-5.2.1_buildchecks.patch

@@ -1,36 +0,0 @@
-diff -ur mapserver-5.2.1/mapogcfilter.c mapserver-5.2.1_new/mapogcfilter.c
---- mapserver-5.2.1/mapogcfilter.c	2008-11-07 17:13:32.000000000 +0100
-+++ mapserver-5.2.1_new/mapogcfilter.c	2009-01-07 19:45:44.000000000 +0100
-@@ -3615,7 +3615,7 @@
-     char *pszWild = NULL;
-     char *pszSingle = NULL;
-     char *pszEscape = NULL;
--    char szTmp[3];
-+    char szTmp[4];
- 
-     int nLength=0, i=0, iBuffer = 0;
-     int  bCaseInsensitive = 0;
-diff -ur mapserver-5.2.1/mapowscommon.c mapserver-5.2.1_new/mapowscommon.c
---- mapserver-5.2.1/mapowscommon.c	2008-07-09 13:27:53.000000000 +0200
-+++ mapserver-5.2.1_new/mapowscommon.c	2009-01-07 19:44:23.000000000 +0100
-@@ -493,7 +493,7 @@
-   /* add attributes to root element */
-   xmlNewProp(psRootNode, BAD_CAST "version", BAD_CAST version);
- 
--  if (language !=  "undefined") {
-+  if (strcmp(language, "undefined")) {
-     if (ows_version == OWS_1_0_0) {
-       ows_version_string = strdup("1.0.0");
-       xmlNewProp(psRootNode, BAD_CAST "language", BAD_CAST language);
-diff -ur mapserver-5.2.1/mapscript/java/Makefile.in mapserver-5.2.1_new/mapscript/java/Makefile.in
---- mapserver-5.2.1/mapscript/java/Makefile.in	2008-01-10 15:48:35.000000000 +0100
-+++ mapserver-5.2.1_new/mapscript/java/Makefile.in	2009-01-07 19:42:49.000000000 +0100
-@@ -211,7 +211,7 @@
- # Java Stuff
- #
- JAVADOC=javadoc
--JAVAC=javac
-+JAVAC=javac -target 1.5 -source 1.5
- JAVA=java
- JAR=jar
- JAVA_INCLUDE=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/@OS_INCLUDE_DIR@

mapserver-5.4.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37eff9d7f0d4571570efccc213f550ad7bfa379f46fcc4331d44e6b779173f46
-size 1875509

mapserver-5.4.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:daab8478039f3c6cfa10d65cfdbca8780fc5aa14a6991311a2166faf2156c12d
+size 1494564

mapserver-5.4.1_buildchecks.patch

@@ -0,0 +1,12 @@
+diff -ur mapserver-5.4.1/mapscript/java/Makefile.in mapserver-5.4.1_new/mapscript/java/Makefile.in
+--- mapserver-5.4.1/mapscript/java/Makefile.in	2009-07-02 13:04:17.000000000 +0200
++++ mapserver-5.4.1_new/mapscript/java/Makefile.in	2008-01-10 15:48:35.000000000 +0100
+@@ -211,7 +211,7 @@
+ # Java Stuff
+ #
+ JAVADOC=javadoc
+-JAVAC=javac
++JAVAC=javac -target 1.5 -source 1.5
+ JAVA=java
+ JAR=jar
+ JAVA_INCLUDE=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/@OS_INCLUDE_DIR@

mapserver.spec

@@ -1,9 +1,9 @@
 Name:           mapserver
-Version:        5.4.0
+Version:        5.4.1
 Release:        1
 License:        BSD
 Group:          Applications/GIS
-Source:         %{name}-%{version}.tar.gz
+Source:         %{name}-%{version}.tar.bz2
 URL:            http://mapserver.gis.umn.edu
 Summary:        Environment for building spatially-enabled internet applications
 Packager:       Stephan Holl <stephan.holl@intevation.de> 
@@ -49,8 +49,7 @@ BuildRequires:  java-1_5_0-ibm-alsa
 %endif
 BuildRequires:  libgcj-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# not needed fpr 5.4.0
+Patch:          mapserver-5.4.1_buildchecks.patch
-#Patch:          mapserver-5.2.1_buildchecks.patch
 
 #%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %define		_cgibindir /srv/www/cgi-bin
@@ -100,7 +99,7 @@ within the Java programming language.
 
 %prep
 %setup -q
-#%patch -p1
+%patch -p1
 # fix spurious perm bits
 chmod -x tests/home.png
 chmod -x mappluginlayer.c