forked from rpms/osbuild-composer
Compare commits
No commits in common. "imports/c8s/osbuild-composer-57-1.el8" and "c8" have entirely different histories.
imports/c8
...
c8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/osbuild-composer-57.tar.gz
|
SOURCES/osbuild-composer-62.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
a92fd9ee889bade3c7ac5dbd73ef89c00bb1565b SOURCES/osbuild-composer-57.tar.gz
|
507b6d1c7dd00aafb3fc3988d7a1f61be10a0c03 SOURCES/osbuild-composer-62.tar.gz
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
%global goipath github.com/osbuild/osbuild-composer
|
%global goipath github.com/osbuild/osbuild-composer
|
||||||
|
|
||||||
Version: 57
|
Version: 62
|
||||||
|
|
||||||
%gometa
|
%gometa
|
||||||
|
|
||||||
@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
|
|||||||
}
|
}
|
||||||
|
|
||||||
Name: osbuild-composer
|
Name: osbuild-composer
|
||||||
Release: 1%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: An image building service based on osbuild
|
Summary: An image building service based on osbuild
|
||||||
|
|
||||||
# osbuild-composer doesn't have support for building i686 and armv7hl images
|
# osbuild-composer doesn't have support for building i686 and armv7hl images
|
||||||
@ -67,9 +67,6 @@ Conflicts: lorax-composer
|
|||||||
Obsoletes: lorax-composer < 34.3
|
Obsoletes: lorax-composer < 34.3
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# remove when F34 is EOL
|
|
||||||
Obsoletes: osbuild-composer-koji <= 23
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{common_description}
|
%{common_description}
|
||||||
|
|
||||||
@ -204,11 +201,11 @@ install -m 0755 -vp tools/gen-ssh.sh %{buildroot}%
|
|||||||
install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp tools/koji-compose-v2.py %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
||||||
install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp tools/s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
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_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/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/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 -vp tools/test-case-generators/generate-test-cases %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
|
||||||
@ -312,16 +309,12 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
|
|||||||
Summary: The worker for osbuild-composer
|
Summary: The worker for osbuild-composer
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
Requires: qemu-img
|
Requires: qemu-img
|
||||||
Requires: osbuild >= 55
|
Requires: osbuild >= 63
|
||||||
Requires: osbuild-ostree >= 55
|
Requires: osbuild-ostree >= 63
|
||||||
Requires: osbuild-lvm2 >= 55
|
Requires: osbuild-lvm2 >= 63
|
||||||
Requires: osbuild-luks2 >= 55
|
Requires: osbuild-luks2 >= 63
|
||||||
Requires: %{name}-dnf-json = %{version}-%{release}
|
Requires: %{name}-dnf-json = %{version}-%{release}
|
||||||
|
|
||||||
# remove in F34
|
|
||||||
Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
|
|
||||||
Provides: golang-github-osbuild-composer-worker = %{version}-%{release}
|
|
||||||
|
|
||||||
%description worker
|
%description worker
|
||||||
The worker for osbuild-composer
|
The worker for osbuild-composer
|
||||||
|
|
||||||
@ -360,6 +353,12 @@ The dnf-json binary used by osbuild-composer and the workers.
|
|||||||
%files dnf-json
|
%files dnf-json
|
||||||
%{_libexecdir}/osbuild-composer/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}
|
%if %{with tests} || 0%{?rhel}
|
||||||
|
|
||||||
%package tests
|
%package tests
|
||||||
@ -431,6 +430,24 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%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
|
||||||
|
|
||||||
* Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
|
* Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user