diff --git a/.gitignore b/.gitignore index d203455..6f35051 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-81.tar.gz +SOURCES/osbuild-93.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index f31ecdd..f391c26 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -aedf98d437f91663abd531a45bd4abd0060d7938 SOURCES/osbuild-81.tar.gz +4ef37f2c681bcf4f4ae6099726b1617fe1db471e SOURCES/osbuild-93.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 6637d86..7cc8ea8 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 81 +Version: 93 %forgemeta @@ -33,6 +33,7 @@ Requires: glibc Requires: policycoreutils Requires: qemu-img Requires: systemd +Requires: skopeo Requires: tar Requires: util-linux Requires: python3-%{pypi_name} = %{version}-%{release} @@ -115,12 +116,19 @@ Summary: Extra tools and utilities Requires: %{name} = %{version}-%{release} Requires: python3-pyyaml +# These are required for `osbuild-dev`, only packaged for Fedora +%if 0%{?fedora} +Requires: python3-rich +Requires: python3-attrs +Requires: python3-typer +%endif + %description tools Contains additional tools and utilities for development of manifests and osbuild. %prep -%forgesetup +%forgeautosetup -p1 %build %py3_build @@ -180,6 +188,9 @@ install -D -p -m 0644 selinux/osbuild.if %{buildroot}%{_datadir}/selinux/devel/i mkdir -p %{buildroot}%{_udevrulesdir} install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir} +# Remove `osbuild-dev` on non-fedora systems +%{!?fedora:rm %{buildroot}%{_bindir}/osbuild-dev} + %check exit 0 # We have some integration tests, but those require running a VM, so that would @@ -248,9 +259,52 @@ fi %files tools %{_bindir}/osbuild-mpp +%{?fedora:%{_bindir}/osbuild-dev} %changelog +* Wed Aug 23 2023 imagebuilder-bot - 93-1 +- New upstream release + +* Thu Aug 17 2023 imagebuilder-bot - 92-1 +- New upstream release + +* Wed Aug 02 2023 imagebuilder-bot - 91-1 +- New upstream release + +* Thu Jul 20 2023 imagebuilder-bot - 90-1 +- New upstream release + +* Tue Jun 27 2023 imagebuilder-bot - 89-1 +- New upstream release + +* Tue Jun 27 2023 Tomáš Hozza - 88-3 +- Increase unit-test duration to 3h + +* Fri Jun 23 2023 Tomáš Hozza - 88-2 +- Fix unit tests in RHEL CI and rebuild RPM + +* Wed Jun 21 2023 imagebuilder-bot - 88-1 +- New upstream release + +* Wed Jun 07 2023 imagebuilder-bot - 87-1 +- New upstream release + +* Tue May 30 2023 imagebuilder-bot - 86-1 +- New upstream release + +* Tue May 30 2023 Tomáš Hozza - 85-2 +- Backport upstream fixes for unit tests on RHEL-8 (PR#1316, PR#1317) + +* Thu May 11 2023 imagebuilder-bot - 85-1 +- New upstream release + +* Thu Apr 27 2023 imagebuilder-bot - 84-1 +- New upstream release + +* Wed Mar 29 2023 imagebuilder-bot - 82-1 +- New upstream release + * Mon Feb 27 2023 imagebuilder-bot - 81-1 - New upstream release