diff --git a/.gitignore b/.gitignore index 02f0721..0f4cb69 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ /osbuild-104.tar.gz /osbuild-105.tar.gz /osbuild-106.tar.gz +/osbuild-117.tar.gz diff --git a/0001-runners-add-Fedora-36-runner.patch b/0001-runners-add-Fedora-36-runner.patch deleted file mode 100644 index 7442a75..0000000 --- a/0001-runners-add-Fedora-36-runner.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e8c219036302817882d469400b08cbac4b93a781 Mon Sep 17 00:00:00 2001 -From: Christian Kellner -Date: Fri, 20 Aug 2021 14:18:28 +0200 -Subject: [PATCH 1/3] runners: add Fedora 36 runner - -New `org.osbuild.fedora36` which is re-using the f30 runner. -Needed since Fedora 36 was branched already. ---- - runners/org.osbuild.fedora36 | 1 + - 1 file changed, 1 insertion(+) - create mode 120000 runners/org.osbuild.fedora36 - -diff --git a/runners/org.osbuild.fedora36 b/runners/org.osbuild.fedora36 -new file mode 120000 -index 0000000..d46777b ---- /dev/null -+++ b/runners/org.osbuild.fedora36 -@@ -0,0 +1 @@ -+org.osbuild.fedora30 -\ No newline at end of file --- -2.21.1 (Apple Git-122.3) - diff --git a/0001-runners-add-fedora38.patch b/0001-runners-add-fedora38.patch deleted file mode 100644 index 296de90..0000000 --- a/0001-runners-add-fedora38.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 135b20a487c2b7435e296c9cfc7f96a826ba2d19 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Budai?= -Date: Mon, 15 Aug 2022 14:13:55 +0200 -Subject: [PATCH] runners: add fedora38 - -It's that time of the year again. ---- - runners/org.osbuild.fedora38 | 1 + - 1 file changed, 1 insertion(+) - create mode 120000 runners/org.osbuild.fedora38 - -diff --git a/runners/org.osbuild.fedora38 b/runners/org.osbuild.fedora38 -new file mode 120000 -index 0000000..d46777b ---- /dev/null -+++ b/runners/org.osbuild.fedora38 -@@ -0,0 +1 @@ -+org.osbuild.fedora30 -\ No newline at end of file --- -2.37.2 - diff --git a/osbuild.spec b/osbuild.spec index 99bbdbf..f8b07d9 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 106 +Version: 117 %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. @@ -290,6 +296,9 @@ fi %{_libexecdir}/osbuild-depsolve-dnf %changelog +* Wed May 01 2024 imagebuilder-bot - 117-1 +- New upstream release + * Wed Jan 31 2024 Packit - 106-1 Changes with 106 ---------------- diff --git a/sources b/sources index 321bc69..f168d7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-106.tar.gz) = d814e1e5431dd7309aecfa50c00a92663162c8d7476eb24416e84b44f9bdd11db9c3e92abe466d6039a225ae756b02f1ec62d30fbb52f571258bdf90a83532bd +SHA512 (osbuild-117.tar.gz) = 7fb7e4614959ff7812978b9044e7f5e0e97b8de15cbea1063f618e17b8d011add1dee4ec45b3d28aba2924d800ae40846fb96d32975569ede22357cdc0e8cd18