import CS osbuild-110-1.el8
This commit is contained in:
parent
13b24552b6
commit
5ff12f966a
|
|
@ -1 +1 @@
|
|||
SOURCES/osbuild-93.tar.gz
|
||||
SOURCES/osbuild-110.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
4ef37f2c681bcf4f4ae6099726b1617fe1db471e SOURCES/osbuild-93.tar.gz
|
||||
a34b43322aef7a58ce2d4faa97029aed690d1de0 SOURCES/osbuild-110.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
%global forgeurl https://github.com/osbuild/osbuild
|
||||
%global selinuxtype targeted
|
||||
|
||||
Version: 93
|
||||
Version: 110
|
||||
|
||||
%forgemeta
|
||||
|
||||
|
|
@ -39,6 +39,12 @@ Requires: util-linux
|
|||
Requires: python3-%{pypi_name} = %{version}-%{release}
|
||||
Requires: (%{name}-selinux if selinux-policy-%{selinuxtype})
|
||||
|
||||
# This is required for `osbuild`, for RHEL-10 and above
|
||||
# the stdlib toml package can be used instead
|
||||
%if 0%{?rhel} < 10
|
||||
Requires: python3-tomli
|
||||
%endif
|
||||
|
||||
# Turn off dependency generators for runners. The reason is that runners are
|
||||
# tailored to the platform, e.g. on RHEL they are using platform-python. We
|
||||
# don't want to pick up those dependencies on other platform.
|
||||
|
|
@ -127,6 +133,20 @@ Requires: python3-typer
|
|||
Contains additional tools and utilities for development of
|
||||
manifests and osbuild.
|
||||
|
||||
%package depsolve-dnf
|
||||
Summary: Dependency solving support for DNF
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
# Fedora 40 and later use libdnf5, RHEL and Fedora < 40 use libdnf
|
||||
%if 0%{?fedora} >= 40
|
||||
Requires: python3-libdnf5 >= 5.1.1
|
||||
%else
|
||||
Requires: python3-libdnf
|
||||
%endif
|
||||
|
||||
%description depsolve-dnf
|
||||
Contains depsolving capabilities for package managers.
|
||||
|
||||
%prep
|
||||
%forgeautosetup -p1
|
||||
|
||||
|
|
@ -145,7 +165,7 @@ bzip2 -9 osbuild.pp
|
|||
%py3_install
|
||||
|
||||
mkdir -p %{buildroot}%{pkgdir}/stages
|
||||
install -p -m 0755 $(find stages -type f) %{buildroot}%{pkgdir}/stages/
|
||||
install -p -m 0755 $(find stages -type f -not -name "test_*.py") %{buildroot}%{pkgdir}/stages/
|
||||
|
||||
mkdir -p %{buildroot}%{pkgdir}/assemblers
|
||||
install -p -m 0755 $(find assemblers -type f) %{buildroot}%{pkgdir}/assemblers/
|
||||
|
|
@ -191,6 +211,15 @@ install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir}
|
|||
# Remove `osbuild-dev` on non-fedora systems
|
||||
%{!?fedora:rm %{buildroot}%{_bindir}/osbuild-dev}
|
||||
|
||||
# Install `osbuild-depsolve-dnf` into libexec
|
||||
mkdir -p %{buildroot}%{_libexecdir}
|
||||
# Fedora 40 and later use dnf5-json, RHEL and Fedora < 40 use dnf-json
|
||||
%if 0%{?fedora} >= 40
|
||||
install -p -m 0755 tools/osbuild-depsolve-dnf5 %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
|
||||
%else
|
||||
install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
|
||||
%endif
|
||||
|
||||
%check
|
||||
exit 0
|
||||
# We have some integration tests, but those require running a VM, so that would
|
||||
|
|
@ -216,6 +245,7 @@ exit 0
|
|||
%exclude %{pkgdir}/inputs/org.osbuild.ostree*
|
||||
%exclude %{pkgdir}/sources/org.osbuild.ostree*
|
||||
%exclude %{pkgdir}/stages/org.osbuild.ostree*
|
||||
%exclude %{pkgdir}/stages/org.osbuild.experimental.ostree*
|
||||
%exclude %{pkgdir}/stages/org.osbuild.rpm-ostree
|
||||
|
||||
%files -n python3-%{pypi_name}
|
||||
|
|
@ -238,6 +268,7 @@ exit 0
|
|||
%{pkgdir}/inputs/org.osbuild.ostree*
|
||||
%{pkgdir}/sources/org.osbuild.ostree*
|
||||
%{pkgdir}/stages/org.osbuild.ostree*
|
||||
%{pkgdir}/stages/org.osbuild.experimental.ostree*
|
||||
%{pkgdir}/stages/org.osbuild.rpm-ostree
|
||||
|
||||
%files selinux
|
||||
|
|
@ -261,8 +292,46 @@ fi
|
|||
%{_bindir}/osbuild-mpp
|
||||
%{?fedora:%{_bindir}/osbuild-dev}
|
||||
|
||||
%files depsolve-dnf
|
||||
%{_libexecdir}/osbuild-depsolve-dnf
|
||||
|
||||
%changelog
|
||||
* Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 110-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Feb 22 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 109-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Feb 01 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 106-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jan 31 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 105-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jan 17 2024 Paweł Poławski <ppolawsk@redhat.com> - 104-2
|
||||
- Fix unit tests in RHEL CI by backporting upstream fixes
|
||||
|
||||
* Tue Jan 16 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 104-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Dec 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Dec 11 2023 Paweł Poławski <ppolawsk@redhat.com> - 100-2
|
||||
- Change unit-test timeout from 3h to 4h
|
||||
|
||||
* Fri Nov 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Sep 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 96-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Sep 13 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 95-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Aug 30 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 94-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Aug 23 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 93-1
|
||||
- New upstream release
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue