From 7d71e76be0914f47d4f1b43fb00a18260758118dfea2d0dcd1d4dbf27d24e064 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Thu, 7 Jun 2018 11:51:21 +0000
Subject: [PATCH] update to 7.2.0-beta1 to support Leap 15.0

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=104
---
 mapserver-7.0.7.tar.gz       |  3 ---
 mapserver-7.2.0-beta1.tar.gz |  3 +++
 mapserver.changes            |  5 +++++
 mapserver.spec               | 16 ++++++++++------
 4 files changed, 18 insertions(+), 9 deletions(-)
 delete mode 100644 mapserver-7.0.7.tar.gz
 create mode 100644 mapserver-7.2.0-beta1.tar.gz

diff --git a/mapserver-7.0.7.tar.gz b/mapserver-7.0.7.tar.gz
deleted file mode 100644
index 5b8f7ab..0000000
--- a/mapserver-7.0.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37a8c3008328bae0fea05109d6d544a3284f756a23956e8a2f5ec10a6b5fef67
-size 2634698
diff --git a/mapserver-7.2.0-beta1.tar.gz b/mapserver-7.2.0-beta1.tar.gz
new file mode 100644
index 0000000..19b8b78
--- /dev/null
+++ b/mapserver-7.2.0-beta1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27e7855e3cefb159fcbbaff67aaf9cca7e8a75c38c496783a95713c01487fb28
+size 2676271
diff --git a/mapserver.changes b/mapserver.changes
index 12533b1..7829fab 100644
--- a/mapserver.changes
+++ b/mapserver.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun  7 11:51:11 UTC 2018 - opensuse@dstoecker.de
+
+- update to 7.2.0-beta1 to support Leap 15.0
+
 -------------------------------------------------------------------
 Fri Dec 15 08:37:40 UTC 2017 - opensuse@dstoecker.de
 
diff --git a/mapserver.spec b/mapserver.spec
index b124de7..da5c805 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -20,17 +20,18 @@
 
 #
 %define libname libmapserver2
-%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")}
 %define _cgibindir /srv/www/cgi-bin
 
 Name:           mapserver
-Version:        7.0.7
+%define realversion 7.2.0-beta1
+Version:        7.2.0_beta1
 Release:        0
 Summary:        Environment for building spatially-enabled internet applications
 License:        MIT
 Group:          Productivity/Networking/Web/Servers
 Url:            http://www.mapserver.org
-Source:         http://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz
+Source:         http://download.osgeo.org/mapserver/%{name}-%{realversion}.tar.gz
 BuildRequires:  FastCGI-devel
 BuildRequires:  apache2-devel
 BuildRequires:  autoconf
@@ -44,10 +45,10 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gd-devel >= 2.0.16
 BuildRequires:  giflib-devel
+BuildRequires:  harfbuzz-devel
 BuildRequires:  krb5-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libexpat-devel
-BuildRequires:  libgcj-devel
 BuildRequires:  libgdal-devel >= 1.10
 BuildRequires:  libgeos-devel
 BuildRequires:  libhdf4
@@ -63,6 +64,8 @@ BuildRequires:  pam
 BuildRequires:  pam-devel
 BuildRequires:  postgresql-devel >= 9.1
 BuildRequires:  proj
+BuildRequires:  libprotobuf-c-devel
+BuildRequires:  protobuf-c
 BuildRequires:  readline-devel
 BuildRequires:  rpm
 BuildRequires:  swig
@@ -182,10 +185,9 @@ The Mapserver development package provides necessary files to build
 against the C Mapserver library.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{realversion}
 
 %build
-
 mkdir build
 cd build
 #Pre export the PREFIX ( having it on the command line doesn't expand correctly for
@@ -227,6 +229,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DWITH_PHP=TRUE \
         -DWITH_POSTGIS=TRUE \
         -DWITH_PROJ=TRUE \
+        -DWITH_PROTOBUFC=TRUE \
         -DWITH_PYTHON=TRUE \
         -DWITH_RUBY=TRUE \
         -DWITH_SOS=TRUE \
@@ -246,6 +249,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DWITH_SDE=FALSE \
         -DWITH_SDE_PLUGIN=FALSE \
         -DWITH_EXEMPI=FALSE \
+        -Wno-dev \
         ..
 
 make %{?jobs:-j%{jobs}}