New upstream release 4.6.0

(cherry picked from commit 2b47d8ea021a7b6e694c52fd8d74880f9a6b79a5)

0001-osbuild-manifest-type-in-config.patch

@@ -1,63 +0,0 @@
-From f30a8b4d15610f40439895b5eb23014650487541 Mon Sep 17 00:00:00 2001
-From: Simon de Vlieger <cmdr@supakeen.com>
-Date: Fri, 22 Sep 2023 11:21:02 +0200
-Subject: [PATCH] osbuild: manifest type in config
-
-Allow the manifest type used to be specified in the pungi configuration
-instead of always selecting the manifest type based on the koji output.
-
-Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
----
- doc/configuration.rst   | 2 ++
- pungi/checks.py         | 1 +
- pungi/phases/osbuild.py | 9 ++++++++-
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/doc/configuration.rst b/doc/configuration.rst
-index fd6a7eeb..238dc0b3 100644
---- a/doc/configuration.rst
-+++ b/doc/configuration.rst
-@@ -1652,6 +1652,8 @@ OSBuild Composer for building images
-     * ``arches`` -- list of architectures for which to build the image. By
-       default, the variant arches are used. This option can only restrict it,
-       not add a new one.
-+    * ``manifest_type`` -- the image type that is put into the manifest by
-+      pungi. If not supplied then it is autodetected from the Koji output.
-     * ``ostree_url`` -- URL of the repository that's used to fetch the parent
-       commit from.
-     * ``ostree_ref`` -- name of the ostree branch
-diff --git a/pungi/checks.py b/pungi/checks.py
-index d6ffabe1..abdbf46c 100644
---- a/pungi/checks.py
-+++ b/pungi/checks.py
-@@ -1244,6 +1244,7 @@ def make_schema():
-                                 "ostree_url": {"type": "string"},
-                                 "ostree_ref": {"type": "string"},
-                                 "ostree_parent": {"type": "string"},
-+                                "manifest_type": {"type": "string"},
-                                 "upload_options": {
-                                     # this should be really 'oneOf', but the minimal
-                                     # required properties in AWSEC2 and GCP options
-diff --git a/pungi/phases/osbuild.py b/pungi/phases/osbuild.py
-index aef1f008..19bc23e2 100644
---- a/pungi/phases/osbuild.py
-+++ b/pungi/phases/osbuild.py
-@@ -249,7 +249,14 @@ class RunOSBuildThread(WorkerThread):
- 
-             # Update image manifest
-             img = Image(compose.im)
--            img.type = archive["type_name"] if archive["type_name"] != "iso" else "dvd"
-+
-+            # Get the manifest type from the config if supplied, otherwise we
-+            # determine the manifest type based on the koji output
-+            img.type = config.get(
-+                "manifest_type",
-+                archive["type_name"] if archive["type_name"] != "iso" else "dvd",
-+            )
-+
-             img.format = suffix
-             img.path = os.path.join(rel_image_dir, archive["filename"])
-             img.mtime = util.get_mtime(image_dest)
--- 
-2.41.0
-

pungi.spec

@@ -1,14 +1,13 @@
 %{?python_enable_dependency_generator}
 
 Name:           pungi
-Version:        4.5.0
-Release:        3%{?dist}.alma
+Version:        4.6.0
+Release:        1%{?dist}
 Summary:        Distribution compose tool
 
 License:        GPL-2.0-only
 URL:            https://pagure.io/pungi
 Source0:        %{name}-%{version}.tar.bz2
-Patch1:         0001-osbuild-manifest-type-in-config.patch
 
 BuildRequires:  make
 BuildRequires:  python3-pytest
@@ -66,7 +65,7 @@ Requires:       python3-libmodulemd >= 2.8.0
 Requires:       python3-gobject
 Requires:       python3-createrepo_c >= 0.20.1
 Requires:       python3-PyYAML
-Requires:       python3-productmd >= 1.28
+Requires:       python3-productmd >= 1.38
 Requires:       python3-flufl-lock
 Requires:       python3-productmd >= 1.33
 Requires:       lorax
@@ -166,6 +165,18 @@ rm %{buildroot}%{_bindir}/pungi
 %{_bindir}/%{name}-cache-cleanup
 
 %changelog
+* Wed Dec 13 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.0-1
+- Add ostree container to image metadata (lsedlar)
+- Updates for ostree-container phase (lsedlar)
+- Add ostree native container support (tim)
+- Improve autodetection of productmd image type for osbuild images (awilliam)
+- pkgset: ignore events for modular content tags (lsedlar)
+- pkgset: Ignore duplicated module builds (lsedlar)
+- Drop buildinstall method (abisoi)
+- Add step to send UMB message (lzhuang)
+- Fix minor Ruff/flake8 warnings (tim)
+- osbuild: manifest type in config (cmdr)
+
 * Mon Sep 25 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.5.0-7
 - Backport patch for explicit setting of osbuild image type in metadata
 

sources

@@ -0,0 +1 @@
+SHA512 (pungi-4.6.0.tar.bz2) = b9cf8ff0e2110fa82afc35a0fdb7aafbf19cc057b3781e0a5ef2f6d9e1794d0434705a325da4b29f7e0f2dd891d44685671e40e50dbf6b63772e32a08f2af580