Accepting request 1194774 from Application:Geo

- Add 0001-Fix-compilation-errors-with-libxml2-2.12.patch

OBS-URL: https://build.opensuse.org/request/show/1194774
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mapserver?expand=0&rev=8

0001-Fix-compilation-errors-with-libxml2-2.12.patch

@@ -0,0 +1,50 @@
+From 2cea5a12a35b396800296cb1c3ea08eb00b29760 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sat, 18 Nov 2023 22:13:46 +0100
+Subject: [PATCH] Fix compilation errors with libxml2 2.12
+
+---
+ mapows.c     |    2 +-
+ mapwcs.cpp   |    2 +-
+ mapwcs20.cpp |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: mapserver-8.0.1/mapows.c
+===================================================================
+--- mapserver-8.0.1.orig/mapows.c
++++ mapserver-8.0.1/mapows.c
+@@ -168,7 +168,7 @@ static int msOWSPreParseRequest(cgiReque
+ #endif
+     if (ows_request->document == NULL
+         || (root = xmlDocGetRootElement(ows_request->document)) == NULL) {
+-      xmlErrorPtr error = xmlGetLastError();
++      const xmlError *error = xmlGetLastError();
+       msSetError(MS_OWSERR, "XML parsing error: %s",
+                  "msOWSPreParseRequest()", error->message);
+       return MS_FAILURE;
+Index: mapserver-8.0.1/mapwcs.cpp
+===================================================================
+--- mapserver-8.0.1.orig/mapwcs.cpp
++++ mapserver-8.0.1/mapwcs.cpp
+@@ -362,7 +362,7 @@ static int msWCSParseRequest(cgiRequestO
+     /* parse to DOM-Structure and get root element */
+     if((doc = xmlParseMemory(request->postrequest, strlen(request->postrequest)))
+         == NULL) {
+-      xmlErrorPtr error = xmlGetLastError();
++      const xmlError *error = xmlGetLastError();
+       msSetError(MS_WCSERR, "XML parsing error: %s",
+                  "msWCSParseRequest()", error->message);
+       return MS_FAILURE;
+Index: mapserver-8.0.1/mapwcs20.cpp
+===================================================================
+--- mapserver-8.0.1.orig/mapwcs20.cpp
++++ mapserver-8.0.1/mapwcs20.cpp
+@@ -1446,7 +1446,7 @@ int msWCSParseRequest20(mapObj *map,
+ 
+     /* parse to DOM-Structure and get root element */
+     if(doc == NULL) {
+-      xmlErrorPtr error = xmlGetLastError();
++      const xmlError *error = xmlGetLastError();
+       msSetError(MS_WCSERR, "XML parsing error: %s",
+                  "msWCSParseRequest20()", error->message);
+       return MS_FAILURE;

_scmsync.obsinfo

@@ -1,4 +1,4 @@
-mtime: 1728904273
-commit: 0cfa2b58a711a2a09b1b64d0333c25ce77482d47d42818a266e9b660e57c93c8
+mtime: 1724099836
+commit: 07d681639e5e67c724dc128237ee247c2fd2484ad005a7c9875aefcb70f99a09
 url: https://src.opensuse.org/jengelh/mapserver
 revision: master

build.specials.obscpio

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a300c5eff585ab1b2e728e8c148cf6ad1fef2d53a14c3e51c9a001e9e1b56b6
+oid sha256:a4d7cc1de98f4c39d57a8658062b5eebb153a7ecc06996b523a5c283f5d5c02b
 size 256

mapserver-8.0.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79d23595ef95d61d3d728ae5e60850a3dbfbf58a46953b4fdc8e6e0ffe5748ba
+size 2950164

mapserver.changes

@@ -1,13 +1,3 @@
--------------------------------------------------------------------
-Sun Oct 13 20:43:59 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 8.2.2
-  * Use EPSGTreatsAsLatLong and EPSGTreatsAsNorthingEasting to
-    determine inverted axis
-- Delete 0001-Fix-compilation-errors-with-libxml2-2.12.patch
-  (merged)
-- Perform multipython build
-
 -------------------------------------------------------------------
 Mon Aug 19 20:30:15 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

mapserver.spec

@@ -30,18 +30,17 @@
 %bcond_with php
 %define php_name    php7
 %endif
-%{?sle15_python_module_pythons}
 
 Name:           mapserver
-Version:        8.2.2
+Version:        8.0.1
 Release:        0
 Summary:        Environment for building spatially-enabled internet applications
 License:        MIT
 Group:          Productivity/Networking/Web/Servers
-#Git-Clone:     https://github.com/MapServer/MapServer
 URL:            https://www.mapserver.org/
 Source:         https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz
 Source9:        %{name}-rpmlintrc
+Patch1:         0001-Fix-compilation-errors-with-libxml2-2.12.patch
 BuildRequires:  FastCGI-devel
 BuildRequires:  apache2-devel
 BuildRequires:  autoconf
@@ -77,7 +76,6 @@ BuildRequires:  postgresql-server-devel >= 9.1
 BuildRequires:  libprotobuf-c-devel
 BuildRequires:  php8-devel
 BuildRequires:  proj
-BuildRequires:  python-rpm-macros
 BuildRequires:  readline-devel
 BuildRequires:  rpm
 %if 0%{with php}
@@ -89,15 +87,8 @@ BuildRequires:  update-alternatives
 BuildRequires:  xorg-x11-libXpm-devel
 BuildRequires:  zlib-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
-%if %{with python}
-BuildRequires:  %python_module devel
-BuildRequires:  %python_module wheel
-BuildRequires:  %python_module pip
-BuildRequires:  %python_module setuptools >= 40.8.0
-%endif
 Requires:       %{libname} = %{version}-%{release}
 Requires:       proj
-%python_subpackages
 
 %description
 Mapserver is an internet mapping program that converts GIS data to
@@ -147,7 +138,12 @@ within the Perl programming language.
 %package -n python-mapscript
 Summary:        Python/Mapscript map making extensions to Python
 Group:          Development/Languages/Python
+%if 0%{with python}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+%endif
 Requires:       %{libname} = %{version}-%{release}
+Requires:       python3-base
 Provides:       mapserver-python = %{version}-%{release}
 Obsoletes:      mapserver-python < %{version}-%{release}
 
@@ -202,6 +198,8 @@ against the C Mapserver library.
 %autosetup -p1
 
 %build
+mkdir build
+cd build
 #Pre export the PREFIX ( having it on the command line doesn't expand correctly for
 #dynamic postgresql location
 export CMAKE_PREFIX_PATH="%{_includedir}:%{_includedir}/fastcgi:%%(pg_config --includedir):%%(pg_config --includedir-server):%%(pg_config --libdir)"
@@ -210,9 +208,6 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
 #specify all options and play with true/false
 #so we always know which option are included in our build.
-%{python_expand #
-mkdir b$python
-pushd b$python
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DCMAKE_SKIP_RPATH=ON \
         -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
@@ -223,7 +218,6 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DCMAKE_BUILD_TYPE="Release" \
         -DCMAKE_SKIP_INSTALL_RPATH=ON \
         -DCMAKE_SKIP_RPATH=ON \
-        -DPython_EXECUTABLE:PATH="/usr/bin/$python" \
         -DWITH_CAIRO=TRUE \
         -DWITH_CLIENT_WFS=TRUE \
         -DWITH_CLIENT_WMS=TRUE \
@@ -276,20 +270,28 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         ..
 
 %make_build
-popd
-}
 
 %check
 # make test
 
 %install
+mkdir -p %{buildroot}/%{_sbindir}
 mkdir -p %{buildroot}/%{_cgibindir}
+mkdir -p %{buildroot}%{_libdir}/%{php_name}/extensions
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}%{python_sitearch}/
+mkdir -p %{buildroot}/%{_includedir}/%{name}
+#Comment this look a bit wired to be useful sub-dir should also needed
+# agg, etc
+cp *.h %{buildroot}/%{_includedir}/%{name}/
 
-%{python_expand #
-pushd b$python
+# fix some exec bits essentially on examples to make rpmlint happy
+# and avoid rpm adding require
+find mapscript/ -type f "(" -iname "*.p[ly]" -o -iname "*.rb" -o -iname "*.dist" ")" -exec chmod -x {} +
+
+cd build
 %make_install
-popd
-}
+cd ..
 
 %if 0%{with php}
 mkdir -p %{buildroot}%{_sysconfdir}/%{php_name}/conf.d/
@@ -314,8 +316,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}/tests/vera \
        %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera
 
 chmod a+x "%{buildroot}/%{_libdir}/libjavamapscript.so"
-rm -fv "%buildroot/etc/mapserver-sample.conf" \
-       "%buildroot/usr/etc/mapserver-sample.conf"
+rm -fv "%buildroot/%_sysconfdir/mapserver-sample.conf"
 echo >"mapserver.conf" <<-EOF
 	CONFIG
 		ENV
@@ -324,10 +325,17 @@ echo >"mapserver.conf" <<-EOF
 	END
 EOF
 
-%ldconfig_scriptlets -n %libname
+%if 0%{?suse_version} < 1550
+mkdir -pv "%buildroot/%python3_sitearch"
+mv -v "%buildroot/%python3_sitelib"/* "%buildroot/%python3_sitearch/"
+%endif
 
-%files -n %name
-%doc README.md HISTORY.md MIGRATION_GUIDE.md mapserver.conf etc/mapserver-sample.conf
+%post -n %{libname} -p /sbin/ldconfig
+
+%postun -n %{libname} -p /sbin/ldconfig
+
+%files
+%doc README.md HISTORY.md MIGRATION_GUIDE.md mapserver.conf
 %doc symbols tests fonts
 %{_bindir}/coshp
 %{_bindir}/map2img
@@ -340,7 +348,6 @@ EOF
 %{_bindir}/msencrypt
 %{_bindir}/shptreetst
 %{_bindir}/shptreevis
-%dir %_cgibindir
 %{_cgibindir}/mapserv
 %{_cgibindir}/legend
 %{_cgibindir}/scalebar
@@ -355,23 +362,23 @@ EOF
 %endif
 
 %files -n perl-mapscript
-%doc src/mapscript/perl/examples
+%doc mapscript/perl/examples
 %dir %{perl_vendorarch}/auto/mapscript
 %{perl_vendorarch}/auto/mapscript/*
 %{perl_vendorarch}/mapscript.pm
 
 %if 0%{with python}
-%files %python_files
-%doc src/mapscript/python/README.rst
-%doc src/mapscript/python/examples
-%doc src/mapscript/python/tests
-%python_sitearch/mapscript*
+%files -n python-mapscript
+%doc mapscript/python/README.rst
+%doc mapscript/python/examples
+%doc mapscript/python/tests
+%{python3_sitearch}/*
 %endif
 
 %files -n libjavamapscript
-%doc src/mapscript/java/README
-%doc src/mapscript/java/examples
-%doc src/mapscript/java/tests
+%doc mapscript/java/README
+%doc mapscript/java/examples
+%doc mapscript/java/tests
 %{_libdir}/libjavamapscript.so
 
 %if 0%{with ruby}
@@ -381,7 +388,7 @@ EOF
 %{rb_sitearchdir}/mapscript.so
 %endif
 
-%files -n mapserver-devel
+%files devel
 %dir %{_includedir}/mapserver
 %{_includedir}/mapserver/*
 %{_libdir}/libmapserver.so