From c0f68851937f85993ea93a84661618f3eba01cb01e24d2b1c4924157dfcc043f Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 8 Sep 2020 08:40:59 +0000
Subject: [PATCH] Accepting request 832766 from
 home:bmanojlovic:branches:Application:Geo

- added _with_python 1 macro so if in future breakage it can be unset
  no need to specially change .spec file
- updated to latest version 7.6.1
- fix building on opensuse leap 15.X
- added mapserver-7.6.1-fix_python_install_path.patch to fix
  python install location defaulting to arch independent location
- a lot of changes between versions please look at:
  https://mapserver.org/development/changelog/changelog-7-6.html#changelog-7-6
  and at this location:
  https://github.com/mapserver/mapserver/blob/branch-7-6/HISTORY.TXT
- security fixes from older versions: CVE-2020-10872 and CVE-2020-10873

OBS-URL: https://build.opensuse.org/request/show/832766
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=115
---
 mapserver-7.4.0.tar.gz                        |  3 ---
 mapserver-7.6.1-fix_python_install_path.patch | 13 +++++++++++++
 mapserver-7.6.1.tar.gz                        |  3 +++
 mapserver.changes                             | 13 +++++++++++++
 mapserver.spec                                |  9 +++++++--
 5 files changed, 36 insertions(+), 5 deletions(-)
 delete mode 100644 mapserver-7.4.0.tar.gz
 create mode 100644 mapserver-7.6.1-fix_python_install_path.patch
 create mode 100644 mapserver-7.6.1.tar.gz

diff --git a/mapserver-7.4.0.tar.gz b/mapserver-7.4.0.tar.gz
deleted file mode 100644
index 7f8757b..0000000
--- a/mapserver-7.4.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc714f5836023fd39005296665c562022fa294348ecc244b93647b3ba1e361f5
-size 2686054
diff --git a/mapserver-7.6.1-fix_python_install_path.patch b/mapserver-7.6.1-fix_python_install_path.patch
new file mode 100644
index 0000000..d824f54
--- /dev/null
+++ b/mapserver-7.6.1-fix_python_install_path.patch
@@ -0,0 +1,13 @@
+Index: mapscript/python/CMakeLists.txt
+===================================================================
+--- mapscript/python/CMakeLists.txt.orig	2020-07-31 19:11:56.000000000 +0200
++++ mapscript/python/CMakeLists.txt	2020-09-05 14:44:10.142799065 +0200
+@@ -146,7 +146,7 @@ install(
+     endif()
+ 
+     execute_process(
+-      COMMAND ${PYTHON_EXECUTABLE} setup.py install \${PYTHON_ROOT} \${PYTHON_PREFIX}
++      COMMAND ${PYTHON_EXECUTABLE} setup.py install --install-lib=${PYTHON_SITE_PACKAGES} \${PYTHON_ROOT} \${PYTHON_PREFIX}
+       WORKING_DIRECTORY ${OUTPUT_FOLDER}
+     )
+   "
diff --git a/mapserver-7.6.1.tar.gz b/mapserver-7.6.1.tar.gz
new file mode 100644
index 0000000..134eca9
--- /dev/null
+++ b/mapserver-7.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d250874d55bee44e0dbbb3a38e612f8572730705edada00c6ab8b2c9e890581
+size 2715826
diff --git a/mapserver.changes b/mapserver.changes
index 06a7d38..add5cea 100644
--- a/mapserver.changes
+++ b/mapserver.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Sep  5 09:14:07 UTC 2020 - Boris Manojlovic <boris@steki.net>
+
+- updated to latest version 7.6.1 
+- fix building on opensuse leap 15.X
+- added mapserver-7.6.1-fix_python_install_path.patch to fix
+  python install location defaulting to arch independent location
+- a lot of changes between versions please look at:
+  https://mapserver.org/development/changelog/changelog-7-6.html#changelog-7-6
+  and at this location:
+  https://github.com/mapserver/mapserver/blob/branch-7-6/HISTORY.TXT
+- security fixes from older versions: CVE-2020-10872 and CVE-2020-10873
+
 -------------------------------------------------------------------
 Fri May 17 09:05:04 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
 
diff --git a/mapserver.spec b/mapserver.spec
index 69b887b..35fbe0e 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -21,6 +21,8 @@
 %bcond_with ruby
 
 #
+# define python for future reference
+%define _with_python 1
 %define libname libmapserver2
 %define _cgibindir /srv/www/cgi-bin
 %if 0%{?suse_version} >= 1500
@@ -30,13 +32,15 @@
 %endif
 
 Name:           mapserver
-Version:        7.4.0
+Version:        7.6.1
 Release:        0
 Summary:        Environment for building spatially-enabled internet applications
 License:        MIT
 Group:          Productivity/Networking/Web/Servers
 Url:            https://www.mapserver.org/
 Source:         https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM mapserver-7.6.1-fix_python_install_path.patch fixing python installation path badly defaulting to arch independent location
+Patch0:         mapserver-7.6.1-fix_python_install_path.patch
 BuildRequires:  FastCGI-devel
 BuildRequires:  apache2-devel
 BuildRequires:  autoconf
@@ -68,7 +72,7 @@ BuildRequires:  openjpeg2-devel
 BuildRequires:  pam
 BuildRequires:  pam-devel
 BuildRequires:  postgresql-devel >= 9.1
-%if 0%{?suse_version} >= 1510
+%if 0%{?suse_version} >= 1500
 BuildRequires:  postgresql-server-devel >= 9.1
 %endif
 BuildRequires:  proj
@@ -206,6 +210,7 @@ against the C Mapserver library.
 %prep
 %setup -q -n %{name}-%{version}
 %global _default_patch_fuzz 5
+%patch0 -p0
 
 %build
 mkdir build