Upgrade PROJ from v9.2.1 to v9.3.0 & GDAL from v3.7.1 to v3.7.2 (EL9) (…

…#170) * Upgrade PROJ from v9.2.1 to v9.3.0 & GDAL from v3.7.1 to v3.7.2 * Upgrade GeoServer release since it's, unfortunately, currently locked to an exact GDAL version. --------- Co-authored-by: Justin Bronn <justin.bronn@maxar.com>
radiant-maxar · Sep 14, 2023 · 4b43325 · 4b43325
1 parent 4714905
commit 4b43325
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/SPECS/el9/proj.spec b/SPECS/el9/proj.spec
@@ -149,6 +149,7 @@ Supplements:  proj\
 %{extrafile}
 
 
+%data_subpkg -c ar -n Argentina
 %data_subpkg -c at -n Austria
 %data_subpkg -c au -n Australia
 %data_subpkg -c be -n Belgium

diff --git a/docker-compose.el9.yml b/docker-compose.el9.yml
@@ -60,7 +60,7 @@ x-rpmbuild:
       version: &caddy_version 2.7.4-1
     gdal:
       image: rpmbuild-gdal
-      version: &gdal_version 3.7.1-2
+      version: &gdal_version 3.7.2-1
       defines:
         geos_min_version: *geos_min_version
         proj_min_version: *proj_min_version
@@ -72,7 +72,7 @@ x-rpmbuild:
       defines:
         gdal_version: *gdal_version
       image: rpmbuild-generic
-      version: &geoserver_version 2.23.1-2
+      version: &geoserver_version 2.23.1-3
     geoserver-geonode:
       arch: noarch
       defines:
@@ -167,9 +167,9 @@ x-rpmbuild:
         protobuf_c_min_version: *protobuf_c_min_version
     proj:
       image: rpmbuild-proj
-      version: &proj_version 9.2.1-1
+      version: &proj_version 9.3.0-1
       defines:
-        data_version: "1.14"
+        data_version: "1.15"
     protozero:
       image: rpmbuild-protozero
       version: &protozero_version 1.7.1-1

diff --git a/docker/el9/Dockerfile.rpmbuild-gdal b/docker/el9/Dockerfile.rpmbuild-gdal
@@ -36,6 +36,7 @@ COPY RPMS/x86_64/CGAL-devel-${cgal_version}${RPMBUILD_DIST}.x86_64.rpm \
      RPMS/x86_64/proj-${proj_version}${RPMBUILD_DIST}.x86_64.rpm \
      RPMS/x86_64/proj-devel-${proj_version}${RPMBUILD_DIST}.x86_64.rpm \
      RPMS/noarch/proj-data-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
+     RPMS/noarch/proj-data-ar-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
      RPMS/noarch/proj-data-at-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
      RPMS/noarch/proj-data-au-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
      RPMS/noarch/proj-data-be-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
@@ -91,6 +92,7 @@ RUN --mount=type=cache,target=/var/cache/dnf \
     "/tmp/proj-${proj_version}${RPMBUILD_DIST}.x86_64.rpm" \
     "/tmp/proj-devel-${proj_version}${RPMBUILD_DIST}.x86_64.rpm" \
     "/tmp/proj-data-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \
+    "/tmp/proj-data-ar-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \
     "/tmp/proj-data-at-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \
     "/tmp/proj-data-au-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \
     "/tmp/proj-data-be-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \

diff --git a/docker/el9/Dockerfile.rpmbuild-libgeotiff b/docker/el9/Dockerfile.rpmbuild-libgeotiff
@@ -9,6 +9,7 @@ ARG proj_version
 COPY RPMS/x86_64/proj-${proj_version}${RPMBUILD_DIST}.x86_64.rpm \
      RPMS/x86_64/proj-devel-${proj_version}${RPMBUILD_DIST}.x86_64.rpm \
      RPMS/noarch/proj-data-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
+     RPMS/noarch/proj-data-ar-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
      RPMS/noarch/proj-data-at-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
      RPMS/noarch/proj-data-au-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
      RPMS/noarch/proj-data-be-${proj_version}${RPMBUILD_DIST}.noarch.rpm \
@@ -50,6 +51,7 @@ RUN --mount=type=cache,target=/var/cache/dnf \
     "/tmp/proj-${proj_version}${RPMBUILD_DIST}.x86_64.rpm" \
     "/tmp/proj-devel-${proj_version}${RPMBUILD_DIST}.x86_64.rpm" \
     "/tmp/proj-data-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \
+    "/tmp/proj-data-ar-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \
     "/tmp/proj-data-at-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \
     "/tmp/proj-data-au-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \
     "/tmp/proj-data-be-${proj_version}${RPMBUILD_DIST}.noarch.rpm" \