From a060cf9c33bfb749b89b7b6d27f13b0275b4e50a Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Fri, 9 Oct 2020 11:20:40 -0400 Subject: [PATCH 1/2] Update to build with libdaos 1.2.0 PR-repos: daos@PR-3610 Signed-off-by: Brian J. Murrell --- hdf5-vol-daos.spec | 8 ++++++-- packaging/Makefile_packaging.mk | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hdf5-vol-daos.spec b/hdf5-vol-daos.spec index 5ca0b8d..e71ddd7 100644 --- a/hdf5-vol-daos.spec +++ b/hdf5-vol-daos.spec @@ -1,7 +1,7 @@ %global with_mpich 1 %global with_openmpi3 1 -%global daos_major 0 +%global daos_major 1 %if %{with_mpich} %global mpi_list mpich @@ -40,7 +40,8 @@ URL: https://portal.hdfgroup.org/display/HDF5/HDF5 Source0: %{source_commit}.tar.gz Source1: %{test_commit}.tar.gz -BuildRequires: daos-devel%{?_isa} +BuildRequires: daos-devel%{?_isa} = 1.1.0-33.5094.gf56b0d3a%{dist} + BuildRequires: gcc, gcc-c++ %if (0%{?suse_version} >= 1500) BuildRequires: cmake >= 3.1 @@ -197,6 +198,9 @@ done %endif %changelog +* Fri Oct 9 2020 Brian J. Murrell - 0.1-3.gb324b90d4 +- Rebuild for libdaos 1.2.0 + * Mon Oct 5 2020 Brian J. Murrell - 0.1-2.gb324b90d4 - Tests packages should not require any -devel packages diff --git a/packaging/Makefile_packaging.mk b/packaging/Makefile_packaging.mk index d152f9c..0dee0b3 100644 --- a/packaging/Makefile_packaging.mk +++ b/packaging/Makefile_packaging.mk @@ -38,7 +38,7 @@ LEAP_15_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-rep EL_7_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos-el7: *\(.*\)/\1/p') UBUNTU_20_04_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos-ubuntu20: *\(.*\)/\1/p') -COMMON_RPM_ARGS := --define "%_topdir $$PWD/_topdir" $(BUILD_DEFINES) +COMMON_RPM_ARGS := --define "_topdir $$PWD/_topdir" $(BUILD_DEFINES) SPEC := $(shell if [ -f $(NAME)-$(DISTRO_BASE).spec ]; then echo $(NAME)-$(DISTRO_BASE).spec; else echo $(NAME).spec; fi) VERSION = $(eval VERSION := $(shell rpm $(COMMON_RPM_ARGS) --specfile --qf '%{version}\n' $(SPEC) | sed -n '1p'))$(VERSION) DEB_RVERS := $(subst $(DOT),\$(DOT),$(VERSION)) @@ -396,6 +396,9 @@ show_patches: show_sources: @echo $(SOURCES) +show_other_sources: + @echo $(OTHER_SOURCES) + show_targets: @echo $(TARGETS) From 3d6e7f09462c89c67023cb9aac4c1aa20d77ab76 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Tue, 27 Oct 2020 12:46:33 -0400 Subject: [PATCH 2/2] DO NOT LAND Update daos version to use 1.2.0 build PR-repos: daos@PR-3610 mpich@PR-39 Signed-off-by: Brian J. Murrell --- hdf5-vol-daos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf5-vol-daos.spec b/hdf5-vol-daos.spec index e71ddd7..55d02ab 100644 --- a/hdf5-vol-daos.spec +++ b/hdf5-vol-daos.spec @@ -40,7 +40,7 @@ URL: https://portal.hdfgroup.org/display/HDF5/HDF5 Source0: %{source_commit}.tar.gz Source1: %{test_commit}.tar.gz -BuildRequires: daos-devel%{?_isa} = 1.1.0-33.5094.gf56b0d3a%{dist} +BuildRequires: daos-devel%{?_isa} = 1.1.1-4.5206.gcf701218%{dist} BuildRequires: gcc, gcc-c++ %if (0%{?suse_version} >= 1500)