From 1cd7d0ed511858e8f6c6ae76711d79a32ca351b6 Mon Sep 17 00:00:00 2001 From: imagebuilder-bot Date: Mon, 26 Feb 2024 17:35:50 +0000 Subject: [PATCH] Update to 50 Resolves: RHEL-1035 --- .gitignore | 1 + cockpit-composer.spec | 9 ++++++--- sources | 2 +- tests/verify.sh | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7c1bd22..0123ca2 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /cockpit-composer-46.tar.gz /cockpit-composer-47.tar.gz /cockpit-composer-49.tar.gz +/cockpit-composer-50.tar.gz diff --git a/cockpit-composer.spec b/cockpit-composer.spec index fe841cc..cefe138 100644 --- a/cockpit-composer.spec +++ b/cockpit-composer.spec @@ -1,5 +1,5 @@ Name: cockpit-composer -Version: 49 +Version: 50 Release: 1%{?dist} Summary: Composer GUI for use with Cockpit @@ -32,8 +32,8 @@ the cloud. It integrates into Cockpit as a frontend for osbuild. mkdir -p %{buildroot}/%{_datadir}/cockpit/composer cp -a public/* %{buildroot}/%{_datadir}/cockpit/composer mkdir -p %{buildroot}/%{_datadir}/metainfo/ -appstream-util validate-relax --nonet public/io.weldr.cockpit-composer.metainfo.xml -cp -a public/io.weldr.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/metainfo/ +appstream-util validate-relax --nonet public/org.image-builder.cockpit-composer.metainfo.xml +cp -a public/org.image-builder.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/metainfo/ %files %doc README.md @@ -42,6 +42,9 @@ cp -a public/io.weldr.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/met %{_datadir}/metainfo/* %changelog +* Mon Feb 26 2024 imagebuilder-bot - 50-1 +- New upstream release + * Mon Feb 26 2024 imagebuilder-bot - 49-1 - New upstream release diff --git a/sources b/sources index 544ddce..60cc0e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-composer-49.tar.gz) = 270da081300053aca8eed15a5b5f83dd67030c738c018c78abd62243df5a947e6b7e14ea20ea57901538028689bcb84a5500d24ed61a2b1ebba45f9d2f94b461 +SHA512 (cockpit-composer-50.tar.gz) = b78cad4c2cc70c0605311dc6a7a20cb5390d83435d564a1d8c2a9390240667ac5fdfc2cd7dd6192957bbdc5511bd307c01fe82da91a4d7b627cb683f3254c5a5 diff --git a/tests/verify.sh b/tests/verify.sh index cc66f29..87908c9 100755 --- a/tests/verify.sh +++ b/tests/verify.sh @@ -21,7 +21,8 @@ elif [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 9 ]]; then fi # HACK: chromium-headless ought to be enough, but greater than version 88 has a crash: https://bugs.chromium.org/p/chromium/issues/detail?id=1170634 dnf install -y chromium - +# HACK: use nodejs:18/common to avoid the default of nodejs 14, which is not available on RHEL 8 +dnf module install -y nodejs:18/common # Taken from https://github.com/cockpit-project/cockpit-machines/commit/6206acd32cb125d54cb17be74afb60d45504e99f#diff-8bc7fea4b1a7acd44c6a752365847e961fa72cbb68efa39ed77ca406e9a5cac4 #HACK: unbreak rhel-9-0's default choice of 999999999 rounds, see https://bugzilla.redhat.com/show_bug.cgi?id=1993919 sed -ie 's/#SHA_CRYPT_MAX_ROUNDS 5000/SHA_CRYPT_MAX_ROUNDS 5000/' /etc/login.defs