7 changed files with 89 additions and 528 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,13 +13,3 @@
 /mapserver-208bb3a10fccdc9c1bdab175915072270abb1b45.tar.gz
 /mapserver-d5c22cd3113ba85f5b1f1c406fe4055f75d04ce3.tar.gz
 /mapserver-7fe9b2b9f74796731cba2f7f09c8f41875f020e4.tar.gz
-/mapserver-7.4.3.tar.gz
-/MapServer-7.4.3.tar.gz
-/MapServer-7.6.1.tar.gz
-/MapServer-7.6.2.tar.gz
-/MapServer-7.6.3.tar.gz
-/MapServer-7.6.4.tar.gz
-/MapServer-8.0.0.tar.gz
-/MapServer-8.0.1.tar.gz
-/MapServer-8.2.1.tar.gz
-/MapServer-8.2.2.tar.gz
--- a/f202bd52b35c82508555af722a8ad0f04910c403.patch
+++ b/f202bd52b35c82508555af722a8ad0f04910c403.patch
@ -1,54 +0,0 @@
-From f202bd52b35c82508555af722a8ad0f04910c403 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 9 Jul 2024 23:34:35 +0200
-Subject: [PATCH] mappostgresql.c: avoid potential invalid use of strcpy()
-
---
- src/mappostgresql.c | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/mappostgresql.c b/src/mappostgresql.c
-index f474650e35..deadbd8a60 100644
--- a/src/mappostgresql.c
-+++ b/src/mappostgresql.c
-@@ -308,14 +308,18 @@ int msPOSTGRESQLJoinNext(joinObj *join) {
-     for (i = 0; i < join->numitems; i++) {
-       length += 8 + strlen(join->items[i]) + 2;
-     }
-+    if (length > 1024 * 1024) {
-+      msSetError(MS_MEMERR, "Too many joins.\n", "msPOSTGRESQLJoinNext()");
-+      return MS_FAILURE;
-+    }
- 
-    columns = (char *)malloc(length);
-+    columns = (char *)malloc(length + 1);
-     if (!columns) {
-       msSetError(MS_MEMERR, "Failure to malloc.\n", "msPOSTGRESQLJoinNext()");
-       return MS_FAILURE;
-     }
- 
-    strcpy(columns, "");
-+    columns[0] = 0;
-     for (i = 0; i < join->numitems; i++) {
-       strcat(columns, "\"");
-       strcat(columns, join->items[i]);
-@@ -326,14 +330,15 @@ int msPOSTGRESQLJoinNext(joinObj *join) {
-     }
- 
-     /* Create the query string. */
-    sql = (char *)malloc(26 + strlen(columns) + strlen(join->table) +
-                         strlen(join->to) + strlen(joininfo->from_value));
-+    const size_t nSize = 26 + strlen(columns) + strlen(join->table) +
-+                         strlen(join->to) + strlen(joininfo->from_value);
-+    sql = (char *)malloc(nSize);
-     if (!sql) {
-       msSetError(MS_MEMERR, "Failure to malloc.\n", "msPOSTGRESQLJoinNext()");
-       return MS_FAILURE;
-     }
-    sprintf(sql, "SELECT %s FROM %s WHERE %s = '%s'", columns, join->table,
-            join->to, joininfo->from_value);
-+    snprintf(sql, nSize, "SELECT %s FROM %s WHERE %s = '%s'", columns,
-+             join->table, join->to, joininfo->from_value);
-     if (joininfo->layer_debug) {
-       msDebug("msPOSTGRESQLJoinNext(): executing %s.\n", sql);
-     }
--- a/mapserver-c99.patch
+++ b/mapserver-c99.patch
@ -1,25 +0,0 @@
-Author: Florian Weimer <fweimer@redhat.com>
-Date:   Wed Jan 3 12:33:55 2024 +0100
-
-    Ruby bindings: Return 0 on exceptions, not NULL
-    
-    At least Ruby 3.2 anf SWIG 4.1 expect an integer here, resulting in
-    an int-conversion error with current/upcoming compilers.  Return 0
-    instead of NULL works with pointer return types, too, should there
-    be a supported Ruby version which uses a pointer in this context.
-
-Submitted upstream: <https://github.com/MapServer/MapServer/pull/6998>
-
-diff --git a/mapscript/ruby/rbmodule.i b/mapscript/ruby/rbmodule.i
-index e5ce85e4883e3ef6..47eda59e32c704d8 100644
--- a/mapscript/ruby/rbmodule.i
-+++ b/mapscript/ruby/rbmodule.i
-@@ -129,7 +129,7 @@ static void _raise_ms_exception() {
-             default:
-                 _raise_ms_exception();
-                 msResetErrorList();
-                return NULL;
-+                return 0;
-         }
- 
-     }
--- a/mapserver-implicit-declarations.patch
+++ b/mapserver-implicit-declarations.patch
@ -1,11 +0,0 @@
-diff -rupN MapServer-rel-8-0-1/CMakeLists.txt MapServer-rel-8-0-1-new/CMakeLists.txt
--- MapServer-rel-8-0-1/CMakeLists.txt	2023-04-17 19:26:04.000000000 +0200
-+++ MapServer-rel-8-0-1-new/CMakeLists.txt	2023-10-03 22:50:49.702462069 +0200
-@@ -280,6 +280,7 @@ flatgeobuf/packedrtree.cpp
- include_directories(flatgeobuf/include)
- 
- #add_definitions(-DHASH_DEBUG=1)
-+add_definitions(-D_DEFAULT_SOURCE)
- if(WIN32)
-   set(REGEX_SOURCES ${REGEX_DIR}/regex.c)
-   include_directories(${REGEX_DIR})
--- a/mapserver-pr6975-libxml2-2_12_0.patch
+++ b/mapserver-pr6975-libxml2-2_12_0.patch
@ -1,83 +0,0 @@
-From 2c1d4f928b9657dbb4517ecbfc8cac30cc73ae9f 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 1/2] Fix compilation errors with libxml2 2.12
-
---
- mapows.c     | 2 +-
- mapwcs.cpp   | 2 +-
- mapwcs20.cpp | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mapows.c b/mapows.c
-index c2fa55521..294a64fb4 100644
--- a/mapows.c
-+++ b/mapows.c
-@@ -162,7 +162,7 @@ static int msOWSPreParseRequest(cgiRequestObj *request,
- #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;
-diff --git a/mapwcs.cpp b/mapwcs.cpp
-index 5459f5bb1..817c8a784 100644
--- a/mapwcs.cpp
-+++ b/mapwcs.cpp
-@@ -383,7 +383,7 @@ static int msWCSParseRequest(cgiRequestObj *request, wcsParamsObj *params,
-     /* 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;
-diff --git a/mapwcs20.cpp b/mapwcs20.cpp
-index 355a00a80..5febbb9d6 100644
--- a/mapwcs20.cpp
-+++ b/mapwcs20.cpp
-@@ -1459,7 +1459,7 @@ int msWCSParseRequest20(mapObj *map, cgiRequestObj *request,
- 
-     /* 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;
-     }
-From a1dd7a851b620be9bf72426f70d82aab21ef4661 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 18 Nov 2023 22:13:57 +0100
-Subject: [PATCH 2/2] Fix compile-time deprecation warnings with libxml2 2.12
-
---
- mapxml.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/mapxml.c b/mapxml.c
-index cb96acc3b..c065619aa 100644
--- a/mapxml.c
-+++ b/mapxml.c
-@@ -48,9 +48,6 @@ int msTransformXmlMapfile(const char *stylesheet, const char *xmlMapfile,
-   exsltRegisterAll();
-   xsltRegisterTestModule();
- 
-  xmlSubstituteEntitiesDefault(1);
-  xmlLoadExtDtdDefaultValue = 1;
-
-   cur = xsltParseStylesheetFile((const xmlChar *)stylesheet);
-   if (cur == NULL) {
-     msSetError(MS_MISCERR, "Failed to load xslt stylesheet", "msTransformXmlMapfile()");
-@@ -58,7 +55,7 @@ int msTransformXmlMapfile(const char *stylesheet, const char *xmlMapfile,
-     goto done;
-   }
- 
-  doc = xmlParseFile(xmlMapfile);
-+  doc = xmlReadFile(xmlMapfile, NULL, XML_PARSE_NOENT | XML_PARSE_DTDLOAD);
-   if (doc == NULL) {
-     msSetError(MS_MISCERR, "Failed to load xml mapfile", "msTransformXmlMapfile()");
-     goto done;
--- a/mapserver.spec
+++ b/mapserver.spec
@ -1,42 +1,25 @@
-%global ini_name 39-mapserver.ini
-%global project_owner MapServer
-%global project_name MapServer
-
-%global python_mapscript 1
-%global srcname mapscript
-
-%ifarch %{java_arches}
-%bcond_without java
-%else
-%bcond_with java
-%endif
-
-%if 0%{?fedora} >= 41
-%ifarch %{ix86}
-%bcond_with    php
-%else
-%bcond_without php
-%endif
-%else
-%bcond_without php
-%endif
+%global ini_name 40-mapserver.ini
+%global project_owner mapserver
+%global project_name mapserver
+# MapServer doesn't support PHP 7 yet. See:
+# https://github.com/mapserver/mapserver/issues/5252
+%global php_mapscript 0
+# MapServer should support Python 3 but still builds with Python 2.
+# This should be investigated.
+%global python_mapscript 0

+%global commit 7fe9b2b9f74796731cba2f7f09c8f41875f020e4
+%global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           mapserver
-Version:        8.2.2
-Release:        4%{?dist}
+Version:        7.2.2
+Release:        3.git%{shortcommit}%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
-%global dashver %(echo %version | sed 's|\\.|-|g')

-License:        MIT
+License:        BSD
 URL:            http://www.mapserver.org

-Source0:        https://github.com/%{project_owner}/%{project_name}/archive/rel-%{dashver}/%{project_name}-%{version}.tar.gz
-
-
-## Upstream patches
-# mappostgresql.c: avoid potential invalid use of strcpy()
-Patch1001:      f202bd52b35c82508555af722a8ad0f04910c403.patch
+Source0:        https://github.com/%{project_owner}/%{project_name}/archive/%{commit}/%{project_name}-%{commit}.tar.gz

 Requires:       httpd
 Requires:       dejavu-sans-fonts
@ -73,11 +56,6 @@ BuildRequires:  proj-devel => 5.2.0
 BuildRequires:  readline-devel
 BuildRequires:  swig
 BuildRequires:  zlib-devel
-#Get
-#/usr/share/fonts/dejavu-sans-fonts/DejaVuSans.ttf
-#/usr/share/fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf
-# See %%prep below
-BuildRequires:  dejavu-sans-fonts


 %description
@ -101,7 +79,7 @@ Requires:       %{name} = %{version}
 %description devel
 This package contains development files for mapserver.

-%if %{with php}
+%if 0%{php_mapscript}
 %package -n php-%{name}
 Summary:        PHP/Mapscript map making extensions to PHP
 BuildRequires:  php-devel
@ -112,12 +90,13 @@ Requires:       php(api) = %{php_core_api}
 %description -n php-%{name}
 The PHP/Mapscript extension provides full map customization capabilities within
 the PHP scripting language.
-%endif
+%endif # end php_mapscript


 %package perl
 Summary:        Perl/Mapscript map making extensions to Perl
 Requires:       %{name} = %{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

 %description perl
 The Perl/Mapscript extension provides full map customization capabilities
@ -132,16 +111,14 @@ Provides: %{name}-python%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-python < %{version}-%{release}
 Summary:        Python/Mapscript map making extensions to Python
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 Requires:       %{name} = %{version}-%{release}
 Requires:       python3

 %description -n python3-mapserver
 The Python/Mapscript extension provides full map customization capabilities
 within the Python programming language.
-%endif
+%endif # end python_mapscript

-%if %{with java}
 %package java
 Summary:        Java/Mapscript map making extensions to Java
 BuildRequires:  java-devel
@ -151,7 +128,6 @@ Requires:       java-headless
 %description java
 The Java/Mapscript extension provides full map customization capabilities
 within the Java programming language.
-%endif


 %package ruby
@ -165,23 +141,37 @@ the ruby programming language.


 %prep
-%autosetup -p1 -n %{project_owner}-rel-%{dashver}
+%setup -q -n %{project_owner}-%{commit}

 # replace fonts for tests with symlinks
-ln -sf /usr/share/fonts/dejavu-sans-fonts/DejaVuSans.ttf tests/vera/Vera.ttf
-ln -sf /usr/share/fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf tests/vera/VeraBd.ttf
+rm -rf tests/vera/Vera.ttf
+rm -rf tests/vera/VeraBd.ttf
+pushd tests/vera/
+ln -sf /usr/share/fonts/dejavu/DejaVuSans.ttf Vera.ttf
+ln -sf /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf VeraBd.ttf
+popd

 # Force swig to regenerate the wrapper
 rm -rf mapscript/perl/mapscript_wrap.c


 %build
+
+mkdir build
+cd build
+
 export CFLAGS="${CFLAGS} -ldl -fPIC -fno-strict-aliasing"
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"

-%cmake -DINSTALL_LIB_DIR=%{_libdir} \
+cmake -DINSTALL_LIB_DIR=%{_libdir} \
+      -DCMAKE_INSTALL_PREFIX=%{_prefix} \
      -DCMAKE_SKIP_RPATH=ON \
+      -DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \
+      -DCMAKE_C_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DCMAKE_BUILD_TYPE="Release" \
      -DCMAKE_SKIP_INSTALL_RPATH=ON \
+      -DCMAKE_SKIP_RPATH=ON \
      -DWITH_CAIRO=TRUE \
      -DWITH_CLIENT_WFS=TRUE \
      -DWITH_CLIENT_WMS=TRUE \
@ -193,25 +183,21 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
      -DWITH_GEOS=TRUE \
      -DWITH_GIF=TRUE \
      -DWITH_ICONV=TRUE \
-%if %{with java}
      -DWITH_JAVA=TRUE \
-%else
-      -DWITH_JAVA=FALSE \
-%endif
      -DWITH_KML=TRUE \
      -DWITH_LIBXML2=TRUE \
      -DWITH_OGR=TRUE \
      -DWITH_MYSQL=TRUE \
      -DWITH_PERL=TRUE \
      -DCUSTOM_PERL_SITE_ARCH_DIR="%{perl_vendorarch}" \
-%if %{with php}
-      -DWITH_PHPNG=TRUE \
-%endif
+%if 0%{php_mapscript}
+      -DWITH_PHP=TRUE \
+%endif # end php_mapscript
      -DWITH_POSTGIS=TRUE \
      -DWITH_PROJ=TRUE \
 %if 0%{python_mapscript}
      -DWITH_PYTHON=TRUE \
-%endif
+%endif # end python_mapscript
      -DWITH_RUBY=TRUE \
      -DWITH_V8=FALSE \
      -DWITH_SOS=TRUE \
@ -230,52 +216,56 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
      -DWITH_SDE=FALSE \
      -DWITH_SDE_PLUGIN=FALSE \
      -DWITH_EXEMPI=FALSE \
-      -Wno-dev
+      -Wno-dev \
+      ..

-%cmake_build
+
+make  %{?_smp_mflags}


 %install
-%cmake_install
-
-# cmake tries to invoke pip and download things. we'll just use setuptools.
-mkdir -p %{buildroot}%{python3_sitearch}
-pushd redhat-linux-build/src/mapscript/python
-%py3_install
-popd
-
+mkdir -p %{buildroot}%{_libexecdir}
+%if 0%{php_mapscript}
+mkdir -p %{buildroot}%{php_inidir}
+mkdir -p %{buildroot}%{php_extdir}
+%endif # end php_mapscript
+mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/%{name}
-install -p -m 644 src/xmlmapfile/mapfile.xsd %{buildroot}%{_datadir}/%{name}
-install -p -m 644 src/xmlmapfile/mapfile.xsl %{buildroot}%{_datadir}/%{name}
+mkdir -p %{buildroot}%{_includedir}/%{name}/
+
+install -p -m 644 xmlmapfile/mapfile.xsd %{buildroot}%{_datadir}/%{name}
+install -p -m 644 xmlmapfile/mapfile.xsl %{buildroot}%{_datadir}/%{name}

-%if %{with java}
 # install java
 mkdir -p %{buildroot}%{_javadir}
-install -p -m 644 %{_vpath_builddir}/src/mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
-%endif
+install -p -m 644 build/mapscript/java/mapscript.jar %{buildroot}%{_javadir}/

-%if %{with php}
+# install header
+install -p -m 644 *.h %{buildroot}%{_includedir}/%{name}/
+
+cd build
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+
+%if 0%{php_mapscript}
 # install php config file
 mkdir -p %{buildroot}%{php_inidir}
 cat > %{buildroot}%{php_inidir}/%{ini_name} <<EOF
 ; Enable %{name} extension module
-extension=php_mapscriptng.so
+extension=php_mapscript.so
 EOF
-%endif
+%endif # end php_mapscript

-# Install sample config file as %%doc
-rm %{buildroot}%{_usr}/%{_sysconfdir}/mapserver-sample.conf
+
+%ldconfig_scriptlets libs


 %files
-%doc README.md
-%doc etc/mapserver-sample.conf
-%{_bindir}/coshp
+%doc README.rst
 %{_bindir}/legend
 %{_bindir}/mapserv
-%{_bindir}/map2img
 %{_bindir}/msencrypt
 %{_bindir}/scalebar
+%{_bindir}/shp2img
 %{_bindir}/shptree
 %{_bindir}/shptreetst
 %{_bindir}/shptreevis
@ -284,298 +274,52 @@ rm %{buildroot}%{_usr}/%{_sysconfdir}/mapserver-sample.conf
 %{_datadir}/%{name}/

 %files libs
-%doc README.md
+%doc README.rst
 %{_libdir}/libmapserver.so.%{version}
 %{_libdir}/libmapserver.so.2

 %files devel
-%doc README.md
+%doc README.rst
 %{_libdir}/libmapserver.so
 %{_includedir}/%{name}/

-%if %{with php}
+%if 0%{php_mapscript}
 %files -n php-%{name}
-%doc src/mapscript/php/README.md
+%doc mapscript/php/README
+%doc mapscript/php/examples
 %config(noreplace) %{php_inidir}/%{ini_name}
-
-# this is only installed when swig < 4.0.2 https://github.com/MapServer/MapServer/blob/25ef061bec310773511eb84ef03f4a91e0f5a081/src/mapscript/phpng/CMakeLists.txt#L86
-%if ! 0%{?fedora} && 0%{?rhel} < 10
-%{php_extdir}/mapscript.php
-%endif
-
-%{php_extdir}/php_mapscriptng.so
-%endif
-# end php-mapcache
+%{php_extdir}/php_mapscript.so*
+%endif # end php_mapscript

 %files perl
-%doc README.md
-%doc src/mapscript/perl/examples
+%doc README.rst
+%doc mapscript/perl/examples
 %dir %{perl_vendorarch}/auto/mapscript
 %{perl_vendorarch}/auto/mapscript/*
 %{perl_vendorarch}/mapscript.pm

 %if 0%{python_mapscript}
 %files -n python3-mapserver
-%doc src/mapscript/python/README.rst
-%doc src/mapscript/python/examples
-%doc src/mapscript/python/tests
+%doc mapscript/python/README
+%doc mapscript/python/examples
+%doc mapscript/python/tests
 %{python3_sitearch}/*mapscript*
-%endif
+%endif # end python_mapscript

-%if %{with java}
 %files java
-%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
 %{_javadir}/*.jar
 %{_libdir}/libjavamapscript.so
-%endif

 %files ruby
-%doc src/mapscript/ruby/README
-%doc src/mapscript/ruby/examples
-%doc mapserver-ruby/README
-%doc mapserver-ruby/examples
+%doc mapscript/ruby/README
+%doc mapscript/ruby/examples
 %{ruby_sitearchdir}/mapscript.so

+
 %changelog
-* Sat Nov 09 2024 Sandro Mani <manisandro@gmail.com> - 8.2.2-4
- Rebuild (GDAL)
-
-* Fri Nov 08 2024 Sandro Mani <manisandro@gmail.com> - 8.2.2-3
- Rebuild (gdal)
-
-* Mon Oct 14 2024 Remi Collet <remi@fedoraproject.org> - 8.2.2-2
- rebuild for https://fedoraproject.org/wiki/Changes/php84
-
-* Tue Sep 03 2024 Neil Hanlon <neil@shrug.pw> - 8.2.2-1
- update to 8.2.2
-
-* Tue Aug 20 2024 Neil Hanlon <neil@shrug.pw> - 8.2.1-1
- update to 8.2.1
- bring in patch for zero-size malloc and buffer overflow
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jun 12 2024 Jitka Plesnikova <jplesnik@redhat.com> - 8.0.1-17
- Perl 5.40 rebuild
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 8.0.1-16
- Rebuilt for Python 3.13
-
-* Mon May 13 2024 Sandro Mani <manisandro@gmail.com> - 8.0.1-15
- Rebuild (gdal)
-
-* Tue Apr  9 2024 Remi Collet <remi@fedoraproject.org> - 8.0.1-14
- disable PHP extension on 32-bit
-  https://fedoraproject.org/wiki/Changes/php_no_32_bit
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 8.0.1-11
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3
-
-* Wed Jan 03 2024 Florian Weimer <fweimer@redhat.com> - 8.0.1-10
- Fix C compatibility issue
-
-* Wed Nov 29 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 8.0.1-9
- Backport upstream patch for compilation with libxml2 2.12.0
-
-* Wed Nov 15 2023 Sandro Mani <manisandro@gmail.com> - 8.0.1-8
- Rebuild (gdal)
-
-* Tue Oct 03 2023 Sandro Mani <manisandro@gmail.com> - 8.0.1-7
- Fix implicit declarations of strlcat
-
-* Tue Oct 03 2023 Remi Collet <remi@remirepo.net> - 8.0.1-6
- rebuild for https://fedoraproject.org/wiki/Changes/php83
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 8.0.1-4
- Perl 5.38 rebuild
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 8.0.1-3
- Rebuilt for Python 3.12
-
-* Thu May 11 2023 Sandro Mani <manisandro@gmail.com> - 8.0.1-2
- Rebuild (gdal)
-
-* Mon Apr 24 2023 Sandro Mani <manisandro@gmail.com> - 8.0.1-1
- Update to 8.0.1
-
-* Thu Mar 09 2023 Sandro Mani <manisandro@gmail.com> - 8.0.0-7
- Fix php extension name in 40-mapserver.ini
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 04 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 8.0.0-5
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2
-
-* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 8.0.0-4
- Rebuild (gdal)
-
-* Sun Oct 30 2022 Sandro Mani <manisandro@gmail.com> - 8.0.0-3
- Fix %%files for build with swig 4.1+
-
-* Wed Oct 05 2022 Remi Collet <remi@remirepo.net> - 8.0.0-2
- rebuild for https://fedoraproject.org/wiki/Changes/php82
-
-* Tue Sep 13 2022 Sandro Mani <manisandro@gmail.com> - 8.0.0-1
- Update to 8.0.0
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.4-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 05 2022 Sandro Mani <manisandro@gmail.com> - 7.6.4-18
- Limit -java subpackage to %%java_arches
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 7.6.4-17
- Rebuilt for Python 3.11
-
-* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 7.6.4-16
- Perl 5.36 rebuild
-
-* Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 7.6.4-15
- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
-
-* Tue Mar 22 2022 Sandro Mani <manisandro@gmail.com> - 7.6.4-14
- It's no longer needed to move Python bindings with setuptools >= 60.x
-
-* Thu Mar 10 2022 Sandro Mani <manisandro@gmail.com> - 7.6.4-13
- Rebuild for proj-9.0.0
-
-* Mon Mar 07 2022 Karolina Surma <ksurma@redhat.com> - 7.6.4-12
- It's no longer needed to move Python bindings with setuptools >= 60.x
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 7.6.4-11
- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 7.6.4-10
- F-36: rebuild against ruby31
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Nov 23 2021 Sandro Mani <manisandro@gmail.com> - 7.6.4-8
- Adapt mapserver_php8.patch to drop TSRMLS_FETCH_FROM_CTX call
-
-* Thu Nov 11 2021 Sandro Mani <manisandro@gmail.com> - 7.6.4-7
- Rebuild (gdal)
-
-* Sat Nov 06 2021 Adrian Reber <adrian@lisas.de> - 7.6.4-6
- Rebuilt for protobuf 3.19.0
-
-* Thu Oct 28 2021 Remi Collet <remi@remirepo.net> - 7.6.4-5
- rebuild for https://fedoraproject.org/wiki/Changes/php81
-
-* Tue Oct 26 2021 Adrian Reber <adrian@lisas.de> - 7.6.4-4
- Rebuilt for protobuf 3.18.1
-
-* Thu Oct 21 2021 Sandro Mani <manisandro@gmail.com> - 7.6.4-3
- Rebuild (geos)
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jul 13 2021 Sandro Mani <manisandro@gmail.com> - 7.6.4-1
- Update to 7.6.4
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 7.6.3-3
- Rebuilt for Python 3.10
-
-* Mon May 24 2021 Jitka Plesnikova <jplesnik@redhat.com> - 7.6.3-2
- Perl 5.34 re-rebuild updated packages
-
-* Sat May 22 2021 Sandro Mani <manisandro@gmail.co;> - 7.6.3-1
- Update to 7.6.3
-
-* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 7.6.2-12
- Perl 5.34 rebuild
-
-* Fri May 07 2021 Sandro Mani <manisandro@gmail.com> - 7.6.2-11
- Rebuild (gdal)
-
-* Mon Mar 29 2021 Sandro Mani <manisandro@gmail.com> - 7.6.2-10
- Rebuild (proj)
-
-* Tue Mar 23 2021 Sandro Mani <manisandro@gmail.com> - 7.6.2-9
- Bump
-
-* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 7.6.2-8
- Rebuild (proj)
-
-* Fri Mar 05 2021 Sandro Mani <manisandro@gmail.com> - 7.6.2-7
- Rebuild (php)
-
-* Sat Feb 13 2021 Sandro Mani <manisandro@gmail.com> - 7.6.2-6
- Rebuild (geos)
-
-* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 7.6.2-5
- rebuild for libpq ABI fix rhbz#1908268
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 13 09:47:12 CET 2021 Adrian Reber <adrian@lisas.de> - 7.6.2-3
- Rebuilt for protobuf 3.14
-
-* Thu Jan  7 2021 Vít Ondruch <vondruch@redhat.com> - 7.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.0
-
-* Thu Dec 10 2020 Sandro Mani <manisandro@gmail.com> - 7.6.2-1
- Update to 7.6.2
-
-* Fri Nov 13 2020 Sandro Mani <manisandro@gmail.com> - 7.6.1-1
- Update to 7.6.1
-
-* Wed Nov 11 12:47:11 CET 2020 Sandro Mani <manisandro@gmail.com> - 7.4.3-11
- Rebuild (proj, gdal)
-
-* Thu Oct 01 2020 Petr Pisar <ppisar@redhat.com> - 7.4.3-10
- Adapt to new CMake (bug #1864110)
-
-* Thu Sep 24 2020 Adrian Reber <adrian@lisas.de> - 7.4.3-9
- Rebuilt for protobuf 3.13
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.3-8
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 7.4.3-6
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 7.4.3-5
- Perl 5.32 rebuild
-
-* Sun Jun 14 2020 Adrian Reber <adrian@lisas.de> - 7.4.3-4
- Rebuilt for protobuf 3.12
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 7.4.3-3
- Rebuilt for Python 3.9
-
-* Thu May 21 2020 Sandro Mani <manisandro@gmail.com> - 7.4.3-2
- Rebuild (gdal)
-
-* Wed Mar 04 2020 Sandro Mani <manisandro@gmail.com> - 7.4.3-1
- Update to 7.4.3
-
-* Tue Mar 03 2020 Sandro Mani <manisandro@gmail.com> - 7.2.2-5.git7fe9b2b
- Rebuild (gdal)
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.2-4.git7fe9b2b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.2-3.git7fe9b2b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (MapServer-8.2.2.tar.gz) = d6509b0a650381e2629dd9defa715eafdc7b0da3c9dfd914b365b9c695c3cdbebb5b980de73247578d10e09b7acccb875a8ead2b9320e9262e3ae840ec35ee42
+SHA512 (mapserver-7fe9b2b9f74796731cba2f7f09c8f41875f020e4.tar.gz) = 119363d5ed5135c8363fcf305b702531350853cd3063f0cb946bbaddb0080c257594cf331e84ce7c24c8bfa04ff1d2308f07cea50ec185d35151a1cbd63330f4