[AUTO-CHERRYPICK] Remove newly added explicit version dependencies in gdal and netcdf. - branch main (#9196)

Co-authored-by: George Mileka <gmileka@users.noreply.github.com>
This commit is contained in:
CBL-Mariner-Bot 2024-05-23 10:13:16 -07:00 коммит произвёл GitHub
Родитель 90eef0e159
Коммит 05b9fbc6b9
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
2 изменённых файлов: 15 добавлений и 6 удалений

Просмотреть файл

@ -15,7 +15,7 @@ Summary: GIS file format library
#global pre rc1
Name: gdal
Version: 3.6.3
Release: 3%{?dist}
Release: 4%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -41,7 +41,7 @@ BuildRequires: geos-devel
BuildRequires: giflib-devel
BuildRequires: gtest-devel
BuildRequires: hdf-devel
BuildRequires: hdf5-devel >= 1.14.4
BuildRequires: hdf5-devel
BuildRequires: json-c-devel
BuildRequires: libdap-devel
BuildRequires: libgeotiff-devel
@ -97,7 +97,7 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: javapackages-local
BuildRequires: jpackage-utils
%endif
Requires: hdf5 >= 1.14.4
Requires: hdf5
%description
Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform
@ -316,6 +316,10 @@ ctest -E "autotest_osr|autotest_alg|autotest_gdrivers|autotest_gcore"
%changelog
* Wed May 22 2024 George Mileka <gmileka@microsoft.com> - 3.6.3-4
Remove the use of explicit hdf5 version from the build-time dependencies.
* Tue May 21 2024 George Mileka <gmileka@microsoft.com> - 3.6.3-3
- Bumping the release version so that this package is re-built with the newer
1.14.4 hdf5 libraries. This ensures that the matching 1.14.4 .so files Will
be used at run time.

Просмотреть файл

@ -12,7 +12,7 @@
Summary: Libraries for the Unidata network Common Data Form
Name: netcdf
Version: 4.9.0
Release: 5%{?dist}
Release: 6%{?dist}
License: NetCDF
Vendor: Microsoft Corporation
Distribution: Mariner
@ -27,7 +27,7 @@ BuildRequires: curl-devel
BuildRequires: doxygen
BuildRequires: gawk
BuildRequires: hdf-static
BuildRequires: hdf5-devel = %{_hdf5_version}
BuildRequires: hdf5-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: libzstd-devel
@ -77,7 +77,7 @@ NetCDF data is:
Summary: Development files for netcdf
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: curl-devel%{?_isa}
Requires: hdf5-devel%{?_isa} >= 1.14.4
Requires: hdf5-devel%{?_isa}
Requires: pkgconfig%{?_isa}
%description devel
@ -398,6 +398,11 @@ done
%changelog
* Wed May 22 2024 George Mileka <gmileka@microsoft.com> - 4.9.0-6
Remove the use of the '_hdf5_version' and explicit hdf5 version from the
build-time dependencies.
* Tue May 21 2024 George Mileka <gmileka@microsoft.com> - 4.9.0-5
- Bumping the release version so that this package is re-built with the newer
1.14.4 hdf5 libraries. This ensures that the matching 1.14.4 .so files Will
be used at run time.