From 891b3bfc81408b41f9454f6d34c121fe05d0f8637664311002b18ff03846e0ed Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 8 Oct 2022 22:07:18 +0000 Subject: [PATCH] - Update to release 8 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=133 --- mapserver-7.6.1-fix_python_install_path.patch | 18 ----------------- mapserver-7.6.4.tar.gz | 3 --- mapserver-8.0.0.tar.gz | 3 +++ mapserver.changes | 20 +++++++++++++++++++ mapserver.spec | 19 ++++++++++++------ 5 files changed, 36 insertions(+), 27 deletions(-) delete mode 100644 mapserver-7.6.1-fix_python_install_path.patch delete mode 100644 mapserver-7.6.4.tar.gz create mode 100644 mapserver-8.0.0.tar.gz diff --git a/mapserver-7.6.1-fix_python_install_path.patch b/mapserver-7.6.1-fix_python_install_path.patch deleted file mode 100644 index 6081462..0000000 --- a/mapserver-7.6.1-fix_python_install_path.patch +++ /dev/null @@ -1,18 +0,0 @@ -# PATCH-FIX-UPSTREAM mapserver-7.6.1-fix_python_install_path.patch fixing python installation path badly defaulting to arch independent location - -There is a _mapserver.so file, which means the installation has to happen to sitearch. -This patch makes it so (i.e. installation to /usr/lib64/python... rather than -/usr/lib/python...) - -diff -Nur mapserver-7.6.3/mapscript/python/CMakeLists.txt new/mapscript/python/CMakeLists.txt ---- mapserver-7.6.3/mapscript/python/CMakeLists.txt 2021-04-30 23:26:25.000000000 +0200 -+++ new/mapscript/python/CMakeLists.txt 2021-05-31 20:53:16.269084059 +0200 -@@ -146,7 +146,7 @@ - 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.4.tar.gz b/mapserver-7.6.4.tar.gz deleted file mode 100644 index ff5f50f..0000000 --- a/mapserver-7.6.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b46c884bc42bd49873806a05325872e4418fc34e97824d4e13d398e86ea474ac -size 2718735 diff --git a/mapserver-8.0.0.tar.gz b/mapserver-8.0.0.tar.gz new file mode 100644 index 0000000..c351124 --- /dev/null +++ b/mapserver-8.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb7ee625eb6fdce9bd9851f83664442845d70d041e449449e88ac855e97d773c +size 2945524 diff --git a/mapserver.changes b/mapserver.changes index a4834fb..fca96fd 100644 --- a/mapserver.changes +++ b/mapserver.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sat Oct 8 20:50:04 UTC 2022 - Jan Engelhardt + +- Update to release 8 + * MapServer now requires a config file. To get back mapserver7 + behavior, copy /usr/share/doc/packages/mapserver/mapserver.conf + to mapserver.conf once. + * The shp2img utility has been renamed to map2img + * FlatGeobuf is now supported natively + * Initial OGC API support + * PHP native MapScript has been removed, in place of PHPNG + (SWIG) MapScript, and PHP unit tests have been re-enabled + * New labeling centerline GEOMTRANSFORM method for polygons + * Numerical validation of mapfile entries + * Removed various deprecated mapfile parameters + * New coshp utility to sort shapefile contents as well as sort + the associated qix spatial index. +- Drop mapserver-7.6.1-fix_python_install_path.patch + (no longer applicable) + ------------------------------------------------------------------- Tue Jul 26 14:54:06 UTC 2022 - Boris Manojlovic diff --git a/mapserver.spec b/mapserver.spec index 4942597..2dc5a29 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -30,7 +30,7 @@ %endif Name: mapserver -Version: 7.6.4 +Version: 8.0.0 Release: 0 Summary: Environment for building spatially-enabled internet applications License: MIT @@ -39,10 +39,7 @@ URL: https://www.mapserver.org/ Source: https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz Source9: %{name}-rpmlintrc # Known issues: -# - /usr/share/cmake/Modules/FindPostgreSQL.cmake is silly -# (the postgresql version list is manual), so no postgresql # - swig 4.0 can't do php8, gotta wait for 4.1 so no php -Patch0: mapserver-7.6.1-fix_python_install_path.patch BuildRequires: FastCGI-devel BuildRequires: apache2-devel BuildRequires: autoconf @@ -106,6 +103,7 @@ or any of the mapscript module (php, java, python, ruby) # We don't require apache2_mod-php8 users could have php5 running # with other modes (cgi, php-fpm, etc) + %package -n php-mapscript Summary: PHP/Mapscript map making extensions to PHP Group: Development/Libraries/Other @@ -315,17 +313,26 @@ rm -rf %{buildroot}%{_docdir}/%{name}/tests/vera \ %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera chmod a+x "%{buildroot}/%{_libdir}/libjavamapscript.so" +rm -fv "%buildroot/%_sysconfdir/mapserver-sample.conf" +echo >"mapserver.conf" <<-EOF + CONFIG + ENV + MS_MAP_PATTERN "^" + END + END +EOF %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig %files -%doc README.rst HISTORY.TXT +%doc README.rst HISTORY.TXT mapserver.conf %doc MIGRATION_GUIDE.txt %doc symbols tests %doc fonts -%{_bindir}/shp2img +%{_bindir}/coshp +%{_bindir}/map2img %{_bindir}/shptree %{_bindir}/sortshp %{_bindir}/tile4ms