diff --git a/.gitignore b/.gitignore index ee975c7..0f95538 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ SOURCES/osbuild-80.tar.gz /osbuild-94.tar.gz /osbuild-95.tar.gz /osbuild-96.tar.gz +/osbuild-100.tar.gz diff --git a/osbuild.spec b/osbuild.spec index c02e510..f718dde 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 96 +Version: 100 %forgemeta @@ -127,6 +127,13 @@ 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} + +%description depsolve-dnf +Contains depsolving capabilities for package managers. + %prep %forgeautosetup -p1 @@ -145,7 +152,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 +198,10 @@ 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} +install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf + %check exit 0 # We have some integration tests, but those require running a VM, so that would @@ -261,8 +272,13 @@ fi %{_bindir}/osbuild-mpp %{?fedora:%{_bindir}/osbuild-dev} +%files depsolve-dnf +%{_libexecdir}/osbuild-depsolve-dnf %changelog +* Fri Nov 24 2023 imagebuilder-bot - 100-1 +- New upstream release + * Wed Sep 27 2023 imagebuilder-bot - 96-1 - New upstream release diff --git a/sources b/sources index 9d557a0..b7736f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-96.tar.gz) = 1c56e32aefd2752711b2edb5fc743d1eb9ab0f79cbdd1677f25778865a0890e82f1f07f1909a02caa52fcb7bf34a3d9a77a3c036d6848647682b57550192b0da +SHA512 (osbuild-100.tar.gz) = 91c350af779e0c35b13ae4cb892a6d6319082a5fc6579e245014ce32bbd0d235bf023a71d4478964797b5be53bf2f73738b141661e069de5be8d929fe2a7d39a