From aca2d775737118ecaf55bd48c63653600d05dd0e Mon Sep 17 00:00:00 2001 From: Maureen Jean Date: Tue, 26 Jan 2021 07:12:57 -0500 Subject: [PATCH] CORCI-1042 build: Update hdf5 to 1.13.0-rc5 PR-repo: hdf5@PR-20 Signed-off-by: Maureen Jean --- MACSio.spec | 5 ++++- packaging/rpm_chrootbuild | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/MACSio.spec b/MACSio.spec index 867394f..f5b4721 100644 --- a/MACSio.spec +++ b/MACSio.spec @@ -22,7 +22,7 @@ Name: MACSio Version: 1.1 -Release: 4%{?commit:.git%{shortcommit}}%{?dist} +Release: 5%{?commit:.git%{shortcommit}}%{?dist} Summary: A Multi-purpose, Application-Centric, Scalable I/O Proxy Application License: GPL @@ -135,6 +135,9 @@ done %endif %changelog +* Tue Jan 26 2021 Maureen Jean - 1.1-5 +- update to build with hdf5 1.13.0-rc5 + * Tue Nov 17 2020 Maureen Jean - 1.1-4 - update to build with latest hdf5 diff --git a/packaging/rpm_chrootbuild b/packaging/rpm_chrootbuild index 321d22f..e2b201d 100755 --- a/packaging/rpm_chrootbuild +++ b/packaging/rpm_chrootbuild @@ -6,6 +6,13 @@ set -uex IFS=\| read -r -a distro_base_local_repos <<< "$DISTRO_BASE_LOCAL_REPOS" if [ -w /etc/mock/"$CHROOT_NAME".cfg ]; then + # Remove the distro repos + if [[ $CHROOT_NAME =~ opensuse-leap-* ]]; then + ed /etc/mock/"$CHROOT_NAME".cfg << EOF +/^# repos$/+2;/^"""$/-1d +wq +EOF + fi echo -e "config_opts['yum.conf'] += \"\"\"\n" >> /etc/mock/"$CHROOT_NAME".cfg for repo in $DISTRO_BASE_PR_REPOS $PR_REPOS; do branch="master"