Merge branch 'c8' into a8

.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

SOURCES/stages-org.osbuild.keymap-create-xorg.conf.d-if-it-d.patch

@@ -0,0 +1,35 @@
+From dcb0850a2edccd1067385c4a50dd2aab62778009 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
+Date: Fri, 1 Sep 2023 14:40:06 +0200
+Subject: [PATCH] stages/org.osbuild.keymap: create xorg.conf.d if it doesn't
+ exist
+
+Newer versions of Fedora don't create this directory by default. This
+commit modifies the stage so it creates it if it doesn't exist.
+---
+ stages/org.osbuild.keymap | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/stages/org.osbuild.keymap b/stages/org.osbuild.keymap
+index 7878fa08..c3a292f5 100755
+--- a/stages/org.osbuild.keymap
++++ b/stages/org.osbuild.keymap
+@@ -18,7 +18,6 @@ be configured for the X11 keyboard.
+ Valid keymaps are generally found in /lib/kbd/keymaps.
+ """
+ 
+-
+ import os
+ import subprocess
+ import sys
+@@ -74,6 +73,7 @@ Section "InputClass"
+ EndSection
+ """
+ 
++    os.makedirs(f"{tree}/etc/X11/xorg.conf.d", mode=0o755, exist_ok=True)
+     with open(f"{tree}/etc/X11/xorg.conf.d/00-keyboard.conf", "w", encoding="utf8") as f:
+         f.write(file_content)
+ 
+-- 
+2.43.0
+

SPECS/osbuild.spec

@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        81
+Version:        93
 
 %forgemeta
 
@@ -9,7 +9,7 @@ Version:        81
 %global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Release:        1%{?dist}.alma
+Release:        1%{?dist}.1.alma.1
 License:        Apache-2.0
 
 URL:            %{forgeurl}
@@ -18,6 +18,9 @@ Source0:        %{forgesource}
 BuildArch:      noarch
 Summary:        A build system for OS images
 
+# https://github.com/osbuild/osbuild/commit/dcb0850a2edccd1067385c4a50dd2aab62778009
+Patch0:         stages-org.osbuild.keymap-create-xorg.conf.d-if-it-d.patch
+
 BuildRequires:  make
 BuildRequires:  python3-devel
 BuildRequires:  python3-docutils
@@ -33,6 +36,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 +119,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
 ln -rs %{_builddir}/%{name}-%{version}/runners/org.osbuild.rhel82 %{_builddir}/%{name}-%{version}/runners/org.osbuild.almalinux8
 
 %if 0%{?almalinux} >= 9
@@ -185,6 +196,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
@@ -253,12 +267,58 @@ fi
 
 %files tools
 %{_bindir}/osbuild-mpp
+%{?fedora:%{_bindir}/osbuild-dev}
 
 
 %changelog
-* Fri Aug 04 2023 Eduard Abdullin <eabdullin@almalinux.org> - 81-1.alma
+* Wed Feb 14 2024 Eduard Abdullin <eabdullin@almalinux.org> - 93-1.1.alma.1
 - Add AlmaLinux runners
 
+* Fri Jan 26 2024 Tomáš Hozza <thozza@redhat.com> - 93-1.1
+- stages/org.osbuild.keymap: create xorg.conf.d if it doesn't exist (RHEL-22840)
+
+* 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
+
+* Tue May 30 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
+- New upstream release
+
+* Tue May 30 2023 Tomáš Hozza <thozza@redhat.com> - 85-2
+- Backport upstream fixes for unit tests on RHEL-8 (PR#1316, PR#1317)
+
+* 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