Merge branch 'c9' into a9

.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-81.tar.gz
+SOURCES/osbuild-93.tar.gz

.osbuild.metadata

@@ -1 +1 @@
-aedf98d437f91663abd531a45bd4abd0060d7938 SOURCES/osbuild-81.tar.gz
+4ef37f2c681bcf4f4ae6099726b1617fe1db471e SOURCES/osbuild-93.tar.gz

SPECS/osbuild.spec

@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        81
+Version:        93
 
 %forgemeta
 
@@ -9,16 +9,12 @@ Version:        81
 %global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Release:        1%{?dist}.1.alma
+Release:        1%{?dist}.alma.1
 License:        Apache-2.0
 
 URL:            %{forgeurl}
 
 Source0:        %{forgesource}
-
-# https://github.com/osbuild/osbuild/pull/1293
-Patch0:		bz2189400.patch
-
 BuildArch:      noarch
 Summary:        A build system for OS images
 
@@ -37,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}
@@ -119,6 +116,13 @@ 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.
@@ -189,6 +193,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
@@ -257,14 +264,51 @@ fi
 
 %files tools
 %{_bindir}/osbuild-mpp
+%{?fedora:%{_bindir}/osbuild-dev}
 
 
 %changelog
-* Fri Aug 04 2023 Eduard Abdullin <eabdullin@almalinux.org> - 81-1.1.alma
+* Wed Dec 20 2023 Eduard Abdullin <eabdullin@almalinux.org> - 93-1.alma.1
 - Add AlmaLinux runners
 
-* Tue Apr 25 2023 Tomas Hozza <thozza@redhat.com> - 81-1.1
-- Preserve manifest list digest when embedding containers (rhbz#2189400)
+* Wed Aug 23 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 93-1
+- New upstream release
+
+* Thu Aug 17 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 92-1
+- New upstream release
+
+* Wed Aug 02 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 91-1
+- New upstream release
+
+* Thu Jul 20 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 90-1
+- New upstream release
+
+* Tue Jun 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 89-1
+- New upstream release
+
+* Tue Jun 27 2023 Tomáš Hozza <thozza@redhat.com> - 88-3
+- Increase unit-test duration to 3h
+
+* Fri Jun 23 2023 Tomáš Hozza <thozza@redhat.com> - 88-2
+- Fix unit tests in RHEL CI and rebuild RPM
+
+* Wed Jun 21 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
+- New upstream release
+
+* Wed Jun 07 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
+- New upstream release
+
+* Wed May 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
+- New upstream release
+
+* Thu May 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
+- New upstream release
+
+* Thu Apr 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
+- New upstream release
+
+* Wed Mar 29 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
+- New upstream release
 
 * Mon Feb 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 81-1
 - New upstream release