From 8b1b44d1e4918a9faef82420e59b5392da00f67a40ed4f0dc4a5ccdfc6c7ece3 Mon Sep 17 00:00:00 2001
From: Bjoern Schilberg <bjoern@intevation.de>
Date: Fri, 11 Mar 2011 08:38:18 +0000
Subject: [PATCH] added new beta-build-parameters

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=61
---
 mapserver-6.0.0-beta1.tar.gz |  3 +++
 mapserver.spec               | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 mapserver-6.0.0-beta1.tar.gz

diff --git a/mapserver-6.0.0-beta1.tar.gz b/mapserver-6.0.0-beta1.tar.gz
new file mode 100644
index 0000000..df67e57
--- /dev/null
+++ b/mapserver-6.0.0-beta1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:645981350db1a82e8048c6b894b2b7b0feaf179eac029e6a4a516c549ca13400
+size 2439764
diff --git a/mapserver.spec b/mapserver.spec
index c2bc2c9..bfea7b3 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -1,5 +1,5 @@
 Name:           mapserver
-Version:        5.6.6
+Version:        6.0.0-beta1
 Release:        1
 License:        BSD
 Group:          Applications/GIS
@@ -11,6 +11,7 @@ Requires:       php
 Requires:       postgresql
 Requires:       mysql
 Requires:       FastCGI
+Requires:       libexpat
 Requires:       python
 Requires:       apache2
 %if 0%{?suse_version} != 1010
@@ -19,6 +20,7 @@ BuildRequires:  xorg-x11-libXpm-devel
 BuildRequires:  rpm, gcc, gcc-c++, pam
 BuildRequires:  pam-devel
 BuildRequires:  postgresql-devel
+BuildRequires:  libexpat-devel
 BuildRequires:  mysql-devel
 BuildRequires:  libgeos-devel
 BuildRequires:  libproj-devel
@@ -59,8 +61,8 @@ BuildRequires:  krb5-devel
 BuildRequires:  libgcj-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:          mapserver-5.4.1_buildchecks.patch
-Patch1:          hidden_layer.patch
-Patch2:          bug3525_verbose_output.patch
+#Patch1:          hidden_layer.patch
+#Patch2:          bug3525_verbose_output.patch
 
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %define		_cgibindir /srv/www/cgi-bin
@@ -111,8 +113,8 @@ within the Java programming language.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1
+#%patch2 -p1
 
 # fix spurious perm bits
 chmod -x tests/home.png
@@ -151,7 +153,9 @@ chmod -x mapscript/php3/README.WIN32
    --with-php=`php-config --include-dir` \
    --with-httpd=/usr/sbin/httpd2 \
    --with-fastcgi=/usr \
-   --with-experimental-png \
+   --with-agg-svg-symbols=yes \
+   --with-expat \
+   --with-kml=yes \
    --without-pdf \
    --without-eppl \
    --with-threads \
@@ -283,6 +287,8 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Fri Mar 11 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0-beta1
+- updated with new upstream release 6.0.0-beta1
 * Sun Feb 27 2011 Angelos Tzotsos <tzotsos@opensuse.org> 5.6.6
 - fixed python package
 * Mon Jan 24 2011 Stephan Holl <stephan.holl@intevation.de> 5.6.6