Compare commits

...

No commits in common. "imports/c8s/osbuild-composer-58-1.el8" and "c8" have entirely different histories.

3 changed files with 30 additions and 8 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/osbuild-composer-58.tar.gz
SOURCES/osbuild-composer-62.tar.gz

View File

@ -1 +1 @@
b043f3dc861a58103c010cfd1fadfc8634e1389d SOURCES/osbuild-composer-58.tar.gz
507b6d1c7dd00aafb3fc3988d7a1f61be10a0c03 SOURCES/osbuild-composer-62.tar.gz

View File

@ -9,7 +9,7 @@
%global goipath github.com/osbuild/osbuild-composer
Version: 58
Version: 62
%gometa
@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 1%{?dist}
Release: 3%{?dist}
Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images
@ -205,6 +205,7 @@ install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%
install -m 0755 -vp tools/s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/generic_s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/generic_s3_https_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/run-mock-auth-servers.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/set-env-variables.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/test-case-generators/generate-test-cases %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
@ -308,10 +309,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer
Requires: systemd
Requires: qemu-img
Requires: osbuild >= 62
Requires: osbuild-ostree >= 62
Requires: osbuild-lvm2 >= 62
Requires: osbuild-luks2 >= 62
Requires: osbuild >= 63
Requires: osbuild-ostree >= 63
Requires: osbuild-lvm2 >= 63
Requires: osbuild-luks2 >= 63
Requires: %{name}-dnf-json = %{version}-%{release}
%description worker
@ -352,6 +353,12 @@ The dnf-json binary used by osbuild-composer and the workers.
%files dnf-json
%{_libexecdir}/osbuild-composer/dnf-json
%post dnf-json
# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root
if [ -e /var/cache/osbuild-composer/rpmmd ]; then
chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd
fi
%if %{with tests} || 0%{?rhel}
%package tests
@ -423,6 +430,21 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Tue Oct 25 2022 Tomáš Hozza <thozza@redhat.com> - 62-3
- Fix ownership of the dnf-json rpmmd files on upgrade (#2136532)
* Fri Oct 21 2022 Tomáš Hozza <thozza@redhat.com> - 62-2
- Fix ownership of the dnf-json rpmmd files on upgrade (#2136532)
* Mon Aug 29 2022 Ondřej Budai <ondrej@budai.cz> - 62-1
- New upstream release
* Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
- New upstream release
* Thu Aug 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
- New upstream release
* Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
- New upstream release