From 4c60f0746824b5d61a1325122b469166e0dfbfd0 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Thu, 28 Jan 2021 06:02:57 +0100
Subject: [PATCH] 24 upstream release

Only disable dependency generator for runners but not other modules.
Include new `Input` binaries.
---
 .gitignore   |  1 +
 osbuild.spec | 25 ++++++++++++++++++-------
 sources      |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e1c8e1..0dced3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /osbuild-21.tar.gz
 /osbuild-22.tar.gz
 /osbuild-23.tar.gz
+/osbuild-24.tar.gz
diff --git a/osbuild.spec b/osbuild.spec
index d4da0f0..80c7b11 100644
--- a/osbuild.spec
+++ b/osbuild.spec
@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        23
+Version:        24
 
 %forgemeta
 
@@ -9,7 +9,7 @@ Version:        23
 %global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        ASL 2.0
 
 URL:            %{forgeurl}
@@ -37,11 +37,10 @@ Requires:       util-linux
 Requires:       python3-%{pypi_name} = %{version}-%{release}
 Requires:       (%{name}-selinux if selinux-policy-%{selinuxtype})
 
-# Turn off dependency generators for assemblers, runners and stages.
-# They run in a container, so there's no reason to generate dependencies
-# from them. As of 2020-03-25 this filters out python3.6 dependency generated
-# by rhel runner.
-%global __requires_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$
+# 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.
+%global __requires_exclude_from ^%{pkgdir}/(runners)/.*$
 
 # Turn off shebang mangling on RHEL. brp-mangle-shebangs (from package
 # redhat-rpm-config) is run on all executables in a package after the `install`
@@ -51,6 +50,10 @@ Requires:       (%{name}-selinux if selinux-policy-%{selinuxtype})
 #   - stages and assemblers, because they are run within osbuild build roots,
 #     which are not required to contain the same OS as the host and might thus
 #     have a different notion of "platform-python".
+# RHEL NB: Since assemblers and stages are not excluded from the dependency
+# generator, this also means that an additional dependency on /usr/bin/python3
+# will be added. This is intended and needed, so that in the host build root
+# /usr/bin/python3 is present so stages and assemblers can be run.
 %global __brp_mangle_shebangs_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$
 
 %{?python_enable_dependency_generator}
@@ -116,6 +119,9 @@ install -p -m 0755 $(find runners -type f -or -type l) %{buildroot}%{pkgdir}/run
 mkdir -p %{buildroot}%{pkgdir}/sources
 install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources
 
+mkdir -p %{buildroot}%{pkgdir}/inputs
+install -p -m 0755 $(find inputs -type f) %{buildroot}%{pkgdir}/inputs
+
 # mount point for bind mounting the osbuild library
 mkdir -p %{buildroot}%{pkgdir}/osbuild
 
@@ -181,6 +187,11 @@ fi
 %selinux_relabel_post -s %{selinuxtype}
 
 %changelog
+* Thu Jan 28 2021 Christian Kellner <ckellner@redhat.com> - 24-1
+- Upstream release 24
+- Turn on dependency generator for everything but runners
+- Include new 'input' binaries
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index b6a2698..c0db432 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-23.tar.gz) = a3f1489cc12c875cc1d1cef52f38a618ee395284cad4c6838e3f0022ad50bc1fd1d0bc53eb3b9ce293ffbef9096f4aa37fd4a506aa04a24017b4fe98787a0f20
+SHA512 (osbuild-24.tar.gz) = 6a9f97bc099335cdddfc2894cffc163569a90afea1e4f0df0961d1c272184a7d9a7c069628e121ba0b45b6a4aeae469ef0ac0aa26862a664580723809622bf9d