Update to build with libdaos 1.2.0

Makefile-rpm.mk

@@ -1,9 +1,6 @@
 NAME    := mpich
 SRC_EXT := gz
 
-PR_REPOS      := #leave blank
-EL_7_PR_REPOS := automake libtool
-
 GIT_TAG := v3.3
 
 TOPDIR  := $(shell echo $$PWD)

mpich-EL_7.spec

@@ -1,10 +1,9 @@
-%global cart_major 4
-%global daos_major 0
+%global daos_major 1
 
 Summary:        A high-performance implementation of MPI
 Name:           mpich
 Version:        3.4~a2
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 URL:            http://www.mpich.org/
 
@@ -41,7 +40,8 @@ BuildRequires:  python36-devel
 %endif
 BuildRequires:  automake >= 1.15
 BuildRequires:  libtool >= 2.4.4
-BuildRequires:  daos-devel
+BuildRequires:  daos-devel%{?_isa} = 1.1.0-33.5094.gf56b0d3a%{dist}
+
 BuildRequires:  libuuid-devel
 Provides:       mpi
 Provides:       mpich2 = %{version}
@@ -52,7 +52,7 @@ Obsoletes:      mpich-3.0 < 3.1
 Obsoletes:      mpich-3.2 < 3.3
 Requires:       environment(modules)
 Provides:       bundled(hwloc) = 2.0.1rc2
-Provides:       %{name}-cart-%{cart_major}-daos-%{daos_major}
+Provides:       %{name}-daos-%{daos_major}
 
 %description
 MPICH is a high-performance and widely portable implementation of the Message
@@ -84,7 +84,7 @@ Obsoletes:      mpich2-autoload < 3.0
 Obsoletes:      mpich-3.0-autoload < 3.1
 # and it's standard package
 Obsoletes:      mpich-3.2-autoload < 3.3
-Provides:       %{name}-autoload-cart-%{cart_major}-daos-%{daos_major}
+Provides:       %{name}-autoload-daos-%{daos_major}
 
 %description autoload
 This package contains profile files that make mpich automatically loaded.
@@ -125,14 +125,14 @@ Contains documentations, examples and man-pages for mpich
 
 %package -n python2-mpich
 Summary:        mpich support for Python 2
-Provides:       %{name}-python2-mpich-cart-%{cart_major}-daos-%{daos_major}
+Provides:       %{name}-python2-mpich-daos-%{daos_major}
 
 %description -n python2-mpich
 mpich support for Python 2.
 
 %package -n python3-mpich
 Summary:        mpich support for Python 3
-Provides:       %{name}-python3-mpich-cart-%{cart_major}-daos-%{daos_major}
+Provides:       %{name}-python3-mpich-daos-%{daos_major}
 
 %description -n python3-mpich
 mpich support for Python 3.
@@ -347,6 +347,9 @@ find %{buildroot} -type f -name "*.la" -delete
 %{python3_sitearch}/%{name}.pth
 
 %changelog
+* Tue Oct 06 2020 Brian J. Murrell <[email protected]> - 3.4~a2-2
+- Rebuild for libdaos 1.2.0
+
 * Tue May 12 2020 Brian J. Murrell <[email protected]> - 3.4~a2-1
 - Update to 3.4a2
 - Disabled %check due to https://github.com/pmodels/mpich/issues/4534

mpich-LEAP_15.spec

@@ -15,7 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%global daos_major 0
+%global daos_major 1
 
 # Static libraries are disabled by default
 # for non HPC builds
@@ -102,7 +102,7 @@ BuildRequires:  mpi-selector
 BuildRequires:  python-devel
 BuildRequires:  sysfsutils
 BuildRequires:  libfabric-devel
-BuildRequires:  daos-devel
+BuildRequires:  daos-devel%{?_isa} = 1.1.0-33.5094.gf56b0d3a%{dist}
 Provides:       %{package_name}-daos-%{daos_major}
 
 Provides:       mpi
@@ -461,6 +461,9 @@ fi
 %endif # !testsuite
 
 %changelog
+* Tue Oct 06 2020 Brian J. Murrell <[email protected]> - 3.4~a2-4
+- Rebuild for libdaos 1.2.0
+
 * Mon Jun 22 2020 Brian J. Murrell <[email protected]> - 3.4~a2-3
 - Add Requires: daos-devel to devel subpackage
 

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))
@@ -49,9 +49,9 @@ RPMS              = $(eval RPMS := $(addsuffix .rpm,$(addprefix _topdir/RPMS/x86
 DEB_TOP          := _topdir/BUILD
 DEB_BUILD        := $(DEB_TOP)/$(NAME)-$(VERSION)
 DEB_TARBASE      := $(DEB_TOP)/$(DEB_NAME)_$(VERSION)
-SOURCE           ?= $(eval SOURCE := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) -S -l $(SPEC) | sed -e 2,\$$d -e 's/\\\#/\\\\\#/g' -e 's/.*:  *//'))$(SOURCE)
-PATCHES          ?= $(eval PATCHES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) -l $(SPEC) | sed -ne 1d -e 's/.*:  *//' -e 's/.*\///' -e '/\.patch/p'))$(PATCHES)
-OTHER_SOURCES    := $(eval OTHER_SOURCES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) -l $(SPEC) | sed -ne 1d -e 's/.*:  *//' -e 's/.*\///' -e '/\.patch/d' -e p))$(OTHER_SOURCES)
+SOURCE           ?= $(eval SOURCE := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -S -l $(SPEC) | sed -e 2,\$$d -e 's/\\\#/\\\\\#/g' -e 's/.*:  *//'))$(SOURCE)
+PATCHES          ?= $(eval PATCHES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -l $(SPEC) | sed -ne 1d -e 's/.*:  *//' -e 's/.*\///' -e '/\.patch/p'))$(PATCHES)
+OTHER_SOURCES    := $(eval OTHER_SOURCES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -l $(SPEC) | sed -ne 1d -e 's/.*:  *//' -e 's/.*\///' -e '/\.patch/d' -e p))$(OTHER_SOURCES)
 SOURCES          := $(addprefix _topdir/SOURCES/,$(notdir $(SOURCE)) $(PATCHES) $(OTHER_SOURCES))
 ifeq ($(ID_LIKE),debian)
 DEBS             := $(addsuffix _$(VERSION)-1_amd64.deb,$(shell sed -n '/-udeb/b; s,^Package:[[:blank:]],$(DEB_TOP)/,p' $(TOPDIR)/debian/control))
@@ -396,6 +396,9 @@ show_patches:
 show_sources:
 	@echo $(SOURCES)
 
+show_other_sources:
+	@echo $(OTHER_SOURCES)
+
 show_targets:
 	@echo $(TARGETS)