diff --git a/.gitignore b/.gitignore index 1ebf1f0..317acdd 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /cockpit-composer-39.tar.gz /cockpit-composer-40.tar.gz /cockpit-composer-41.tar.gz +/cockpit-composer-42.tar.gz diff --git a/cockpit-composer.spec b/cockpit-composer.spec index c159e69..b452720 100644 --- a/cockpit-composer.spec +++ b/cockpit-composer.spec @@ -1,5 +1,5 @@ Name: cockpit-composer -Version: 41 +Version: 42 Release: 1%{?dist} Summary: Composer GUI for use with Cockpit @@ -8,7 +8,6 @@ URL: http://weldr.io/ Source0: https://github.com/osbuild/cockpit-composer/releases/download/%{version}/cockpit-composer-%{version}.tar.gz BuildArch: noarch -BuildRequires: libappstream-glib Requires: cockpit %if 0%{?fedora} >= 33 || 0%{?rhel} >= 8 @@ -30,10 +29,9 @@ the cloud. It integrates into Cockpit as a frontend for osbuild. %install mkdir -p %{buildroot}/%{_datadir}/cockpit/composer -cp -a public/dist/* %{buildroot}/%{_datadir}/cockpit/composer +cp -a public/* %{buildroot}/%{_datadir}/cockpit/composer mkdir -p %{buildroot}/%{_datadir}/metainfo/ -appstream-util validate-relax --nonet io.weldr.cockpit-composer.metainfo.xml -cp -a io.weldr.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/metainfo/ +cp -a public/io.weldr.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/metainfo/ %files %doc README.md @@ -42,6 +40,9 @@ cp -a io.weldr.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/metainfo/ %{_datadir}/metainfo/* %changelog +* Mon Nov 28 2022 imagebuilder-bot - 42-1 +- New upstream release + * Mon Sep 05 2022 Jacob Kozol - 41-1 - New upstream release diff --git a/sources b/sources index ba1369a..1bdcd39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-composer-41.tar.gz) = 5f7fe81068241dcb9097cf2703818992cda35c4c008389a89d12e64c6d64699e0c1b189382b7d185779ca9cd0c5357cd8aeae5c7bb30bdcfa0c837af134a53c6 +SHA512 (cockpit-composer-42.tar.gz) = 069626dced96a5af91970f3bc0368f3ecfecdb5e8bbfba0147c65eb21b994387ee9573cdf64c3f4a4bf0d3ca2e9ca446f214020163e20c4eb8e9e0d2752a0277 diff --git a/tests/run-test.sh b/tests/run-test.sh index 2300e6d..083494b 100755 --- a/tests/run-test.sh +++ b/tests/run-test.sh @@ -15,7 +15,7 @@ export TEST_OS="${ID}-${VERSION_ID/./-}" RC=0 -for t in test/verify/check-{blueprint,custom,service,source,wizard} +for t in test/verify/check-{blueprints,image,wizard} do $t \ --enable-network \ diff --git a/tests/verify.sh b/tests/verify.sh index 93b149e..cc66f29 100755 --- a/tests/verify.sh +++ b/tests/verify.sh @@ -28,7 +28,7 @@ sed -ie 's/#SHA_CRYPT_MAX_ROUNDS 5000/SHA_CRYPT_MAX_ROUNDS 5000/' /etc/login.def # overriding osbuild-composer repo with nightly mkdir -p /etc/osbuild-composer/repositories -cp $SOURCE/test/files/rhel-91.json /etc/osbuild-composer/repositories/rhel-91.json +cp $SOURCE/test/files/rhel-*.json /etc/osbuild-composer/repositories/ # Make cockpit.socket and lorax-composer start systemctl start cockpit.socket