diff --git a/0001-Fix-compilation-errors-with-libxml2-2.12.patch b/0001-Fix-compilation-errors-with-libxml2-2.12.patch deleted file mode 100644 index 8759b40..0000000 --- a/0001-Fix-compilation-errors-with-libxml2-2.12.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2cea5a12a35b396800296cb1c3ea08eb00b29760 Mon Sep 17 00:00:00 2001 -From: Even Rouault -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; diff --git a/mapserver-8.0.1.tar.gz b/mapserver-8.0.1.tar.gz deleted file mode 100644 index 8e46f47..0000000 --- a/mapserver-8.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79d23595ef95d61d3d728ae5e60850a3dbfbf58a46953b4fdc8e6e0ffe5748ba -size 2950164 diff --git a/mapserver-8.2.2.tar.gz b/mapserver-8.2.2.tar.gz new file mode 100644 index 0000000..72864fc --- /dev/null +++ b/mapserver-8.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47d8ee4bd12ddd2f04b24aa84c6e58f8e6990bcd5c150ba42e22f30ad30568e4 +size 2966634 diff --git a/mapserver.changes b/mapserver.changes index c7e96e0..c8b3782 100644 --- a/mapserver.changes +++ b/mapserver.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Oct 13 20:43:59 UTC 2024 - Jan Engelhardt + +- 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 diff --git a/mapserver.spec b/mapserver.spec index ebb3666..907df6b 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -30,17 +30,18 @@ %bcond_with php %define php_name php7 %endif +%{?sle15_python_module_pythons} Name: mapserver -Version: 8.0.1 +Version: 8.2.2 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 @@ -76,6 +77,7 @@ 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} @@ -87,8 +89,15 @@ 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 @@ -138,12 +147,7 @@ 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} @@ -198,8 +202,6 @@ 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)" @@ -208,6 +210,9 @@ 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} \ @@ -218,6 +223,7 @@ 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 \ @@ -270,28 +276,20 @@ 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}/ -# 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 +%{python_expand # +pushd b$python %make_install -cd .. +popd +} %if 0%{with php} mkdir -p %{buildroot}%{_sysconfdir}/%{php_name}/conf.d/ @@ -316,7 +314,8 @@ 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" +rm -fv "%buildroot/etc/mapserver-sample.conf" \ + "%buildroot/usr/etc/mapserver-sample.conf" echo >"mapserver.conf" <<-EOF CONFIG ENV @@ -325,17 +324,10 @@ echo >"mapserver.conf" <<-EOF END EOF -%if 0%{?suse_version} < 1550 -mkdir -pv "%buildroot/%python3_sitearch" -mv -v "%buildroot/%python3_sitelib"/* "%buildroot/%python3_sitearch/" -%endif +%ldconfig_scriptlets -n %libname -%post -n %{libname} -p /sbin/ldconfig - -%postun -n %{libname} -p /sbin/ldconfig - -%files -%doc README.md HISTORY.md MIGRATION_GUIDE.md mapserver.conf +%files -n %name +%doc README.md HISTORY.md MIGRATION_GUIDE.md mapserver.conf etc/mapserver-sample.conf %doc symbols tests fonts %{_bindir}/coshp %{_bindir}/map2img @@ -348,6 +340,7 @@ mv -v "%buildroot/%python3_sitelib"/* "%buildroot/%python3_sitearch/" %{_bindir}/msencrypt %{_bindir}/shptreetst %{_bindir}/shptreevis +%dir %_cgibindir %{_cgibindir}/mapserv %{_cgibindir}/legend %{_cgibindir}/scalebar @@ -362,23 +355,23 @@ mv -v "%buildroot/%python3_sitelib"/* "%buildroot/%python3_sitearch/" %endif %files -n perl-mapscript -%doc mapscript/perl/examples +%doc src/mapscript/perl/examples %dir %{perl_vendorarch}/auto/mapscript %{perl_vendorarch}/auto/mapscript/* %{perl_vendorarch}/mapscript.pm %if 0%{with python} -%files -n python-mapscript -%doc mapscript/python/README.rst -%doc mapscript/python/examples -%doc mapscript/python/tests -%{python3_sitearch}/* +%files %python_files +%doc src/mapscript/python/README.rst +%doc src/mapscript/python/examples +%doc src/mapscript/python/tests +%python_sitearch/mapscript* %endif %files -n libjavamapscript -%doc mapscript/java/README -%doc mapscript/java/examples -%doc mapscript/java/tests +%doc src/mapscript/java/README +%doc src/mapscript/java/examples +%doc src/mapscript/java/tests %{_libdir}/libjavamapscript.so %if 0%{with ruby} @@ -388,7 +381,7 @@ mv -v "%buildroot/%python3_sitelib"/* "%buildroot/%python3_sitearch/" %{rb_sitearchdir}/mapscript.so %endif -%files devel +%files -n mapserver-devel %dir %{_includedir}/mapserver %{_includedir}/mapserver/* %{_libdir}/libmapserver.so