Skip to content

Commit 05b9fbc

Browse files
[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>
1 parent 90eef0e commit 05b9fbc

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

SPECS-EXTENDED/gdal/gdal.spec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Summary: GIS file format library
1515
#global pre rc1
1616
Name: gdal
1717
Version: 3.6.3
18-
Release: 3%{?dist}
18+
Release: 4%{?dist}
1919
License: MIT
2020
Vendor: Microsoft Corporation
2121
Distribution: Mariner
@@ -41,7 +41,7 @@ BuildRequires: geos-devel
4141
BuildRequires: giflib-devel
4242
BuildRequires: gtest-devel
4343
BuildRequires: hdf-devel
44-
BuildRequires: hdf5-devel >= 1.14.4
44+
BuildRequires: hdf5-devel
4545
BuildRequires: json-c-devel
4646
BuildRequires: libdap-devel
4747
BuildRequires: libgeotiff-devel
@@ -97,7 +97,7 @@ BuildRequires: java-devel >= 1:1.6.0
9797
BuildRequires: javapackages-local
9898
BuildRequires: jpackage-utils
9999
%endif
100-
Requires: hdf5 >= 1.14.4
100+
Requires: hdf5
101101

102102
%description
103103
Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform
@@ -316,6 +316,10 @@ ctest -E "autotest_osr|autotest_alg|autotest_gdrivers|autotest_gcore"
316316

317317

318318
%changelog
319+
* Wed May 22 2024 George Mileka <gmileka@microsoft.com> - 3.6.3-4
320+
Remove the use of explicit hdf5 version from the build-time dependencies.
321+
322+
* Tue May 21 2024 George Mileka <gmileka@microsoft.com> - 3.6.3-3
319323
- Bumping the release version so that this package is re-built with the newer
320324
1.14.4 hdf5 libraries. This ensures that the matching 1.14.4 .so files Will
321325
be used at run time.

SPECS-EXTENDED/netcdf/netcdf.spec

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Summary: Libraries for the Unidata network Common Data Form
1313
Name: netcdf
1414
Version: 4.9.0
15-
Release: 5%{?dist}
15+
Release: 6%{?dist}
1616
License: NetCDF
1717
Vendor: Microsoft Corporation
1818
Distribution: Mariner
@@ -27,7 +27,7 @@ BuildRequires: curl-devel
2727
BuildRequires: doxygen
2828
BuildRequires: gawk
2929
BuildRequires: hdf-static
30-
BuildRequires: hdf5-devel = %{_hdf5_version}
30+
BuildRequires: hdf5-devel
3131
BuildRequires: libtool
3232
BuildRequires: libxml2-devel
3333
BuildRequires: libzstd-devel
@@ -77,7 +77,7 @@ NetCDF data is:
7777
Summary: Development files for netcdf
7878
Requires: %{name}%{?_isa} = %{version}-%{release}
7979
Requires: curl-devel%{?_isa}
80-
Requires: hdf5-devel%{?_isa} >= 1.14.4
80+
Requires: hdf5-devel%{?_isa}
8181
Requires: pkgconfig%{?_isa}
8282

8383
%description devel
@@ -398,6 +398,11 @@ done
398398

399399

400400
%changelog
401+
* Wed May 22 2024 George Mileka <gmileka@microsoft.com> - 4.9.0-6
402+
Remove the use of the '_hdf5_version' and explicit hdf5 version from the
403+
build-time dependencies.
404+
405+
* Tue May 21 2024 George Mileka <gmileka@microsoft.com> - 4.9.0-5
401406
- Bumping the release version so that this package is re-built with the newer
402407
1.14.4 hdf5 libraries. This ensures that the matching 1.14.4 .so files Will
403408
be used at run time.

0 commit comments

Comments
 (0)