jengelh/mapserver
SHA256
1
0
Fork 0
forked from pool/mapserver
Code Pull Requests Activity

fixed build issues

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=20
This commit is contained in:
Dirk Stoecker 2009-01-07 18:55:35 +00:00 committed by Git OBS Bridge
parent 16e904145a
commit 3745b9bd3a
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mapserver-5.2.1_buildchecks.patch Normal file
View File

@ -0,0 +1,36 @@
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@

4
mapserver.spec
View File

@ -41,7 +41,7 @@ BuildRequires: swig
BuildRequires: java-devel >= 1.5 BuildRequires: java-devel >= 1.5
BuildRequires: update-alternatives BuildRequires: update-alternatives
BuildRequires: apache2-devel BuildRequires: apache2-devel
BuildRequires: java BuildRequires: java >= 1.5
%if 0%{?sles_version} == 10 %if 0%{?sles_version} == 10
%ifarch i586 %ifarch i586
BuildRequires: java-1_5_0-ibm-alsa BuildRequires: java-1_5_0-ibm-alsa
@ -49,6 +49,7 @@ BuildRequires: java-1_5_0-ibm-alsa
%endif %endif
BuildRequires: libgcj-devel BuildRequires: libgcj-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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 python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
%define _cgibindir /srv/www/cgi-bin %define _cgibindir /srv/www/cgi-bin
@ -98,6 +99,7 @@ within the Java programming language.
%prep %prep
%setup -q %setup -q
%patch -p1
# fix spurious perm bits # fix spurious perm bits
chmod -x tests/home.png chmod -x tests/home.png
chmod -x rfc/ms-rfc-8.txt chmod -x rfc/ms-rfc-8.txt