From b900bf86f4131d1f41f1d0f1d67c455eadfc0f47 Mon Sep 17 00:00:00 2001 From: Devrim Gunduz Date: Mon, 8 Dec 2025 17:12:17 +0300 Subject: [PATCH] PostGIS 3.5, 3.4, 3.3 and 3.2: Build with GDAL 3.12 on all platforms except RHEL 8 and SLES 15. --- .../non-common/postgis32/main/postgis32.spec | 50 +++++++++++-------- .../non-common/postgis33/main/postgis33.spec | 44 +++++++++------- .../non-common/postgis34/main/postgis34.spec | 48 ++++++++++-------- .../non-common/postgis35/main/postgis35.spec | 22 +++++--- 4 files changed, 98 insertions(+), 66 deletions(-) diff --git a/rpm/redhat/main/non-common/postgis32/main/postgis32.spec b/rpm/redhat/main/non-common/postgis32/main/postgis32.spec index 5943f1a6e..813d47b93 100644 --- a/rpm/redhat/main/non-common/postgis32/main/postgis32.spec +++ b/rpm/redhat/main/non-common/postgis32/main/postgis32.spec @@ -7,24 +7,29 @@ %pgdg_set_gis_variables # Override some variables: -%global geosfullversion %geos314fullversion -%global geosmajorversion %geos314majorversion -%global geosinstdir %geos314instdir +%global geosfullversion %geos314fullversion +%global geosmajorversion %geos314majorversion +%global geosinstdir %geos314instdir %if 0%{?rhel} && 0%{?rhel} == 8 -%global gdalfullversion %gdal38fullversion -%global gdalmajorversion %gdal38majorversion -%global gdalinstdir %gdal38instdir -%global projmajorversion %proj96majorversion -%global projfullversion %proj96fullversion -%global projinstdir %proj96instdir +%global gdalfullversion %gdal38fullversion +%global gdalmajorversion %gdal38majorversion +%global gdalinstdir %gdal38instdir +%global projmajorversion %proj96majorversion +%global projfullversion %proj96fullversion +%global projinstdir %proj96instdir %else -%global gdalfullversion %gdal311fullversion -%global gdalmajorversion %gdal311majorversion -%global gdalinstdir %gdal311instdir -%global projmajorversion %proj97majorversion -%global projfullversion %proj97fullversion -%global projinstdir %proj97instdir +%global gdalfullversion %gdal312fullversion +%global gdalmajorversion %gdal312majorversion +%global gdalinstdir %gdal312instdir +%global projmajorversion %proj97majorversion +%global projfullversion %proj97fullversion +%global projinstdir %proj97instdir +%endif +%if 0%{?suse_version} == 1500 +%global gdalfullversion %gdal311fullversion +%global gdalmajorversion %gdal311majorversion +%global gdalinstdir %gdal311instdir %endif %global libgeotiffmajorversion 17 @@ -60,7 +65,7 @@ Summary: Geographic Information Systems Extensions to PostgreSQL Name: %{sname}%{postgiscurrmajorversion}_%{pgmajorversion} Version: %{postgismajorversion}.8 -Release: 14PGDG%{?dist} +Release: 15PGDG%{?dist} License: GPLv2+ Source0: https://download.osgeo.org/postgis/source/postgis-%{version}.tar.gz Source2: https://download.osgeo.org/postgis/docs/postgis-%{version}.pdf @@ -71,8 +76,8 @@ URL: https://www.postgis.net/ BuildRequires: postgresql%{pgmajorversion}-devel geos%{geosmajorversion}-devel >= %{geosfullversion} BuildRequires: libgeotiff%{libgeotiffmajorversion}-devel libxml2 libxslt autoconf -BuildRequires: pgdg-srpm-macros >= 1.0.50 gmp-devel pcre2-devel -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 8 +BuildRequires: pgdg-srpm-macros >= 1.0.52 gmp-devel pcre2-devel +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 Requires: pcre2 %else Requires: libpcre2-8-0 @@ -94,7 +99,7 @@ BuildRequires: libxml2-devel BuildRequires: gtk2-devel > 2.8.0 %endif %if %{sfcgal} -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 9 +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 9 BuildRequires: SFCGAL SFCGAL-devel >= 2.0.0 %endif %if 0%{?rhel} == 8 || 0%{?suse_version} >= 1500 @@ -133,7 +138,7 @@ Requires: libjson-c5 Requires: libxerces-c-3_3 BuildRequires: libxerces-c-devel %endif -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 Requires: json-c xerces-c BuildRequires: xerces-c-devel %endif @@ -264,7 +269,7 @@ autoconf %if %{shp2pgsqlgui} --with-gui \ %endif -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1500 +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1500 --with-protobuf \ %else --without-protobuf \ @@ -398,6 +403,9 @@ fi %endif %changelog +* Mon Dec 8 2025 Devrim Gunduz - 3.2.8-15PGDG +- Build with GDAL 3.12 on all platforms except RHEL 8 and SLES 15. + * Wed Nov 12 2025 Devrim Gunduz - 3.2.8-14PGDG - Fix pcre2 dependency on RHEL 8 and 9. Per report from Christopher Lorenz: https://www.postgresql.org/message-id/fc8e323142484d98b5d1720e0811ce9c%40ZIT-BB.Brandenburg.de diff --git a/rpm/redhat/main/non-common/postgis33/main/postgis33.spec b/rpm/redhat/main/non-common/postgis33/main/postgis33.spec index 61ec2843b..647831e57 100644 --- a/rpm/redhat/main/non-common/postgis33/main/postgis33.spec +++ b/rpm/redhat/main/non-common/postgis33/main/postgis33.spec @@ -7,24 +7,29 @@ %pgdg_set_gis_variables # Override some variables: -%global geosfullversion %geos314fullversion -%global geosmajorversion %geos314majorversion -%global geosinstdir %geos314instdir +%global geosfullversion %geos314fullversion +%global geosmajorversion %geos314majorversion +%global geosinstdir %geos314instdir %if 0%{?rhel} && 0%{?rhel} == 8 -%global gdalfullversion %gdal38fullversion -%global gdalmajorversion %gdal38majorversion -%global gdalinstdir %gdal38instdir -%global projmajorversion %proj96majorversion -%global projfullversion %proj96fullversion -%global projinstdir %proj96instdir +%global gdalfullversion %gdal38fullversion +%global gdalmajorversion %gdal38majorversion +%global gdalinstdir %gdal38instdir +%global projmajorversion %proj96majorversion +%global projfullversion %proj96fullversion +%global projinstdir %proj96instdir %else -%global gdalfullversion %gdal311fullversion -%global gdalmajorversion %gdal311majorversion -%global gdalinstdir %gdal311instdir -%global projmajorversion %proj97majorversion -%global projfullversion %proj97fullversion -%global projinstdir %proj97instdir +%global gdalfullversion %gdal312fullversion +%global gdalmajorversion %gdal312majorversion +%global gdalinstdir %gdal312instdir +%global projmajorversion %proj97majorversion +%global projfullversion %proj97fullversion +%global projinstdir %proj97instdir +%endif +%if 0%{?suse_version} == 1500 +%global gdalfullversion %gdal311fullversion +%global gdalmajorversion %gdal311majorversion +%global gdalinstdir %gdal311instdir %endif %global libgeotiffmajorversion 17 @@ -63,8 +68,8 @@ URL: https://www.postgis.net/ BuildRequires: postgresql%{pgmajorversion}-devel geos%{geosmajorversion}-devel >= %{geosfullversion} BuildRequires: libgeotiff%{libgeotiffmajorversion}-devel libxml2 libxslt autoconf -BuildRequires: pgdg-srpm-macros >= 1.0.50 gmp-devel pcre2-devel -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 8 +BuildRequires: pgdg-srpm-macros >= 1.0.52 gmp-devel pcre2-devel +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 Requires: pcre2 %else Requires: libpcre2-8-0 @@ -126,7 +131,7 @@ Requires: libjson-c5 Requires: libxerces-c-3_3 BuildRequires: libxerces-c-devel %endif -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 Requires: json-c xerces-c BuildRequires: xerces-c-devel %endif @@ -387,6 +392,9 @@ fi %endif %changelog +* Mon Dec 8 2025 Devrim Gunduz - 3.3.8-15PGDG +- Build with GDAL 3.12 on all platforms except RHEL 8 and SLES 15. + * Wed Nov 12 2025 Devrim Gunduz - 3.3.8-14PGDG - Fix pcre2 dependency on RHEL 8 and 9. Per report from Christopher Lorenz: https://www.postgresql.org/message-id/fc8e323142484d98b5d1720e0811ce9c%40ZIT-BB.Brandenburg.de diff --git a/rpm/redhat/main/non-common/postgis34/main/postgis34.spec b/rpm/redhat/main/non-common/postgis34/main/postgis34.spec index dc6eab664..42bc64a24 100644 --- a/rpm/redhat/main/non-common/postgis34/main/postgis34.spec +++ b/rpm/redhat/main/non-common/postgis34/main/postgis34.spec @@ -7,24 +7,29 @@ %pgdg_set_gis_variables # Override some variables: -%global geosfullversion %geos314fullversion -%global geosmajorversion %geos314majorversion -%global geosinstdir %geos314instdir +%global geosfullversion %geos314fullversion +%global geosmajorversion %geos314majorversion +%global geosinstdir %geos314instdir %if 0%{?rhel} && 0%{?rhel} == 8 -%global gdalfullversion %gdal38fullversion -%global gdalmajorversion %gdal38majorversion -%global gdalinstdir %gdal38instdir -%global projmajorversion %proj96majorversion -%global projfullversion %proj96fullversion -%global projinstdir %proj96instdir +%global gdalfullversion %gdal38fullversion +%global gdalmajorversion %gdal38majorversion +%global gdalinstdir %gdal38instdir +%global projmajorversion %proj96majorversion +%global projfullversion %proj96fullversion +%global projinstdir %proj96instdir %else -%global gdalfullversion %gdal311fullversion -%global gdalmajorversion %gdal311majorversion -%global gdalinstdir %gdal311instdir -%global projmajorversion %proj97majorversion -%global projfullversion %proj97fullversion -%global projinstdir %proj97instdir +%global gdalfullversion %gdal312fullversion +%global gdalmajorversion %gdal312majorversion +%global gdalinstdir %gdal312instdir +%global projmajorversion %proj97majorversion +%global projfullversion %proj97fullversion +%global projinstdir %proj97instdir +%endif +%if 0%{?suse_version} == 1500 +%global gdalfullversion %gdal311fullversion +%global gdalmajorversion %gdal311majorversion +%global gdalinstdir %gdal311instdir %endif %{!?llvm:%global llvm 1} @@ -33,7 +38,7 @@ %{!?shp2pgsqlgui:%global shp2pgsqlgui 1} %{!?raster:%global raster 1} -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1500 +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1500 %{!?sfcgal:%global sfcgal 1} %endif %if 0%{?rhel} == 8 @@ -47,7 +52,7 @@ Summary: Geographic Information Systems Extensions to PostgreSQL Name: %{sname}%{postgiscurrmajorversion}_%{pgmajorversion} Version: %{postgismajorversion}.4 -Release: 14PGDG%{?dist} +Release: 15PGDG%{?dist} License: GPLv2+ Source0: https://download.osgeo.org/postgis/source/postgis-%{version}.tar.gz Source2: https://download.osgeo.org/postgis/docs/postgis-%{version}-en.pdf @@ -57,8 +62,8 @@ URL: https://www.postgis.net/ BuildRequires: postgresql%{pgmajorversion}-devel geos%{geosmajorversion}-devel >= %{geosfullversion} BuildRequires: libgeotiff%{libgeotiffmajorversion}-devel libxml2 libxslt autoconf -BuildRequires: pgdg-srpm-macros >= 1.0.50 gmp-devel pcre2-devel -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 8 +BuildRequires: pgdg-srpm-macros >= 1.0.52 gmp-devel pcre2-devel +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 Requires: pcre2 %else Requires: libpcre2-8-0 @@ -117,7 +122,7 @@ Requires: libjson-c5 Requires: libxerces-c-3_3 BuildRequires: libxerces-c-devel %endif -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 Requires: json-c xerces-c BuildRequires: xerces-c-devel %endif @@ -382,6 +387,9 @@ fi %endif %changelog +* Mon Dec 8 2025 Devrim Gunduz - 3.4.4-15PGDG +- Build with GDAL 3.12 on all platforms except RHEL 8 and SLES 15. + * Wed Nov 12 2025 Devrim Gunduz - 3.4.4-14PGDG - Fix pcre2 dependency on RHEL 8 and 9. Per report from Christopher Lorenz: https://www.postgresql.org/message-id/fc8e323142484d98b5d1720e0811ce9c%40ZIT-BB.Brandenburg.de diff --git a/rpm/redhat/main/non-common/postgis35/main/postgis35.spec b/rpm/redhat/main/non-common/postgis35/main/postgis35.spec index 4c33f75a7..bf9d8e874 100644 --- a/rpm/redhat/main/non-common/postgis35/main/postgis35.spec +++ b/rpm/redhat/main/non-common/postgis35/main/postgis35.spec @@ -19,13 +19,18 @@ %global projfullversion %proj96fullversion %global projinstdir %proj96instdir %else -%global gdalfullversion %gdal311fullversion -%global gdalmajorversion %gdal311majorversion -%global gdalinstdir %gdal311instdir +%global gdalfullversion %gdal312fullversion +%global gdalmajorversion %gdal312majorversion +%global gdalinstdir %gdal312instdir %global projmajorversion %proj97majorversion %global projfullversion %proj97fullversion %global projinstdir %proj97instdir %endif +%if 0%{?suse_version} == 1500 +%global gdalfullversion %gdal311fullversion +%global gdalmajorversion %gdal311majorversion +%global gdalinstdir %gdal311instdir +%endif %{!?llvm:%global llvm 1} @@ -47,7 +52,7 @@ Summary: Geographic Information Systems Extensions to PostgreSQL Name: %{sname}%{postgiscurrmajorversion}_%{pgmajorversion} Version: %{postgismajorversion}.4 -Release: 3PGDG%{?dist} +Release: 4PGDG%{?dist} License: GPLv2+ Source0: https://download.osgeo.org/postgis/source/postgis-%{version}.tar.gz Source2: https://download.osgeo.org/postgis/docs/postgis-%{version}-en.pdf @@ -57,8 +62,8 @@ URL: https://www.postgis.net/ BuildRequires: postgresql%{pgmajorversion}-devel geos%{geosmajorversion}-devel >= %{geosfullversion} BuildRequires: libgeotiff%{libgeotiffmajorversion}-devel libxml2 libxslt -BuildRequires: pgdg-srpm-macros >= 1.0.50 gmp-devel pcre2-devel -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 8 +BuildRequires: pgdg-srpm-macros >= 1.0.52 gmp-devel pcre2-devel +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 Requires: pcre2 %else Requires: libpcre2-8-0 @@ -117,7 +122,7 @@ Requires: libjson-c5 Requires: libxerces-c-3_3 BuildRequires: libxerces-c-devel %endif -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 Requires: json-c xerces-c BuildRequires: xerces-c-devel %endif @@ -384,6 +389,9 @@ fi %endif %changelog +* Mon Dec 8 2025 Devrim Gunduz - 3.5.4-4PGDG +- Build with GDAL 3.12 on all platforms except RHEL 8 and SLES 15. + * Wed Nov 12 2025 Devrim Gunduz - 3.5.4-3PGDG - Fix pcre2 dependency on RHEL 8 and 9. Per report from Christopher Lorenz: https://www.postgresql.org/message-id/fc8e323142484d98b5d1720e0811ce9c%40ZIT-BB.Brandenburg.de -- 2.39.5