From 74d47eaf1c7cff2bce480b1c08ec39987f35ad37 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Mon, 11 Sep 2023 10:05:16 -0400 Subject: [PATCH 1/3] adding changelog updates for xdmod10.5 release --- CHANGELOG.md | 5 ++++- xdmod-appkernels.spec.in | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 684fc43..b094e3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ Open XDMoD Application Kernels Change Log ========================================= -## XXXX-XX-XX v10.5.0 +## 2023-09-11 v10.5.0 + +- Miscellaneous + - Updated for compatibility with Open XDMoD 10.5.0 ## 2022-03-10 v10.0.0 diff --git a/xdmod-appkernels.spec.in b/xdmod-appkernels.spec.in index 6951eef..17fe1e2 100644 --- a/xdmod-appkernels.spec.in +++ b/xdmod-appkernels.spec.in @@ -65,6 +65,8 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/cron.d/%{name} %changelog +* Tue Sept 11 2023 XDMoD 10.5.0-1.0 + - Release 10.5.0 * Thu Mar 10 2022 XDMoD 10.0.0-1.0 - Release 10.0.0 * Fri May 21 2021 XDMoD 9.5.0-1.0 From 7b403fd84e50cde8c3a99e21fce083446d0c4676 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Mon, 11 Sep 2023 10:28:27 -0400 Subject: [PATCH 2/3] adding COMPOSER=composer-el7.json so tests will run --- tests/runtests.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/runtests.sh b/tests/runtests.sh index ef90bf0..b10f889 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -57,8 +57,7 @@ if [ "$(realpath "$XDMOD_DIR/open_xdmod/modules/appkernels")" != "$(realpath "$X echo "$XDMOD_DIR/open_xdmod/modules/appkernels do not point to $XDMOD_APPKERNEL_DIR" fi - -composer install -d ../xdmod --no-progress +COMPOSER=composer-el7.json composer install -d ../xdmod --no-progress # build xdmod rpms cd ../xdmod From cd88a955b004d3222aee9194cf169fa51dbc1b86 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Mon, 11 Sep 2023 10:31:57 -0400 Subject: [PATCH 3/3] fixing date in changelog --- xdmod-appkernels.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdmod-appkernels.spec.in b/xdmod-appkernels.spec.in index 17fe1e2..9bd64de 100644 --- a/xdmod-appkernels.spec.in +++ b/xdmod-appkernels.spec.in @@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/cron.d/%{name} %changelog -* Tue Sept 11 2023 XDMoD 10.5.0-1.0 +* Tue Sep 11 2023 XDMoD 10.5.0-1.0 - Release 10.5.0 * Thu Mar 10 2022 XDMoD 10.0.0-1.0 - Release 10.0.0