.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-18.tar.gz
+SOURCES/osbuild-110.tar.gz

.osbuild.metadata

@@ -1 +0,0 @@
-9bf4e1ce90639dcefba530df762de397f8e39bd6 SOURCES/osbuild-18.tar.gz

SOURCES/no-floats-in-sources.patch

@@ -1,53 +0,0 @@
-From 7b0db90c76c6b0de6a4d481e63450e8f0d1a1d9d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com>
-Date: Thu, 25 Jun 2020 09:56:30 +0200
-Subject: [PATCH] sources/files: do not pass floats to --max-time
-
-curl uses strtod from the C standard library to convert the --max-time's value
-from string to double. However, this is what strtod expects:
-
-nonempty sequence of decimal digits optionally containing decimal-point
-character (as determined by the current C locale)
-
-Yeah, unfortunately, the decimal-point character is determined by the current
-C locale. For example, Czech and German locale uses a comma as the
-decimal-point character.
-
-For reasons I don't fully understand, Python thinks it's running on en_US
-locale, even though LC_NUMERIC is set to cs_CZ, so it uses a full stop as the
-decimal-point character when converting float to string. However, as written
-before, curl fails to parse this because it expects comma.
-
-The fix I chose is simple: Use math.ceil, so only an integer can be passed to
-curl. Why ceil? Because --max-time == 0 sounds fishy. math.ceil should return
-an integer (and it does in Python 3.8) but the documentation is not 100% clear
-on this topic, so let's be paranoid and also convert it to int after the
-ceiling.
----
- sources/org.osbuild.files | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/sources/org.osbuild.files b/sources/org.osbuild.files
-index 42ff6ca..13ce9b8 100755
---- a/sources/org.osbuild.files
-+++ b/sources/org.osbuild.files
-@@ -17,6 +17,7 @@ import concurrent.futures
- import glob
- import itertools
- import json
-+import math
- import os
- import subprocess
- import sys
-@@ -102,7 +103,7 @@ def fetch(url, checksum, directory):
-             curl_command = [
-                 "curl",
-                 "--silent",
--                "--max-time", f"{300 - elapsed_time}",
-+                "--max-time", f"{int(math.ceil(300 - elapsed_time))}",
-                 "--connect-timeout", "60",
-                 "--fail",
-                 "--location",
--- 
-2.26.2
-

SPECS/osbuild.spec

@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        18
+Version:        110
 
 %forgemeta
 
@@ -9,21 +9,22 @@ Version:        18
 %global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Release:        2%{?dist}
+Release:        1%{?dist}.alma.1
-License:        ASL 2.0
+License:        Apache-2.0
 
 URL:            %{forgeurl}
 
 Source0:        %{forgesource}
-Patch0:         no-floats-in-sources.patch
 BuildArch:      noarch
 Summary:        A build system for OS images
 
 BuildRequires:  make
 BuildRequires:  python3-devel
 BuildRequires:  python3-docutils
+BuildRequires:  systemd
 
 Requires:       bash
+Requires:       bubblewrap
 Requires:       coreutils
 Requires:       curl
 Requires:       dnf
@@ -32,17 +33,36 @@ Requires:       glibc
 Requires:       policycoreutils
 Requires:       qemu-img
 Requires:       systemd
-Requires:       systemd-container
+Requires:       skopeo
 Requires:       tar
 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.
+# This is required for `osbuild`, for RHEL-10 and above
-# They run in a container, so there's no reason to generate dependencies
+# the stdlib toml package can be used instead
-# from them. As of 2020-03-25 this filters out python3.6 dependency generated
+%if 0%{?rhel} < 10
-# by rhel runner.
+Requires:       python3-tomli
-%global __requires_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$
+%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.
+%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`
+# section runs. The below macro turns this behavior off for:
+#   - runners, because they already have the correct shebang for the platform
+#     they're meant for, and
+#   - 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}
 
@@ -56,6 +76,24 @@ Summary:        %{summary}
 %description -n python3-%{pypi_name}
 A build system for OS images
 
+%package        lvm2
+Summary:        LVM2 support
+Requires:       %{name} = %{version}-%{release}
+Requires:       lvm2
+
+%description lvm2
+Contains the necessary stages and device host
+services to build LVM2 based images.
+
+%package        luks2
+Summary:        LUKS2 support
+Requires:       %{name} = %{version}-%{release}
+Requires:       cryptsetup
+
+%description luks2
+Contains the necessary stages and device host
+services to build LUKS2 encrypted images.
+
 %package        ostree
 Summary:        OSTree support
 Requires:       %{name} = %{version}-%{release}
@@ -69,7 +107,8 @@ to build OSTree based images.
 %package        selinux
 Summary:        SELinux policies
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  selinux-policy
+Requires:       selinux-policy-%{selinuxtype}
+Requires(post): selinux-policy-%{selinuxtype}
 BuildRequires:  selinux-policy-devel
 %{?selinux_requires}
 
@@ -78,9 +117,38 @@ Contains the necessary SELinux policies that allows
 osbuild to use labels unknown to the host inside the
 containers it uses to build OS artifacts.
 
+%package        tools
+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.
+
+%package        depsolve-dnf
+Summary:        Dependency solving support for DNF
+Requires:       %{name} = %{version}-%{release}
+
+# Fedora 40 and later use libdnf5, RHEL and Fedora < 40 use libdnf
+%if 0%{?fedora} >= 40
+Requires: python3-libdnf5 >= 5.1.1
+%else
+Requires: python3-libdnf
+%endif
+
+%description    depsolve-dnf
+Contains depsolving capabilities for package managers.
+
 %prep
-%forgesetup
+%forgeautosetup -p1
-%patch0 -p1
 
 %build
 %py3_build
@@ -90,14 +158,20 @@ make man
 make -f /usr/share/selinux/devel/Makefile osbuild.pp
 bzip2 -9 osbuild.pp
 
-%pre
+%pre selinux
 %selinux_relabel_pre -s %{selinuxtype}
 
 %install
 %py3_install
 
+ln -rs %{_builddir}/%{name}-%{version}/runners/org.osbuild.rhel82 %{_builddir}/%{name}-%{version}/runners/org.osbuild.almalinux8
+
+%if 0%{?almalinux} >= 9
+ln -rs %{_builddir}/%{name}-%{version}/runners/org.osbuild.centos9 %{_builddir}/%{name}-%{version}/runners/org.osbuild.almalinux9
+%endif
+
 mkdir -p %{buildroot}%{pkgdir}/stages
-install -p -m 0755 $(find stages -type f) %{buildroot}%{pkgdir}/stages/
+install -p -m 0755 $(find stages -type f -not -name "test_*.py") %{buildroot}%{pkgdir}/stages/
 
 mkdir -p %{buildroot}%{pkgdir}/assemblers
 install -p -m 0755 $(find assemblers -type f) %{buildroot}%{pkgdir}/assemblers/
@@ -108,12 +182,21 @@ 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}/devices
+install -p -m 0755 $(find devices -type f) %{buildroot}%{pkgdir}/devices
+
+mkdir -p %{buildroot}%{pkgdir}/inputs
+install -p -m 0755 $(find inputs -type f) %{buildroot}%{pkgdir}/inputs
+
+mkdir -p %{buildroot}%{pkgdir}/mounts
+install -p -m 0755 $(find mounts -type f) %{buildroot}%{pkgdir}/mounts
+
 # mount point for bind mounting the osbuild library
 mkdir -p %{buildroot}%{pkgdir}/osbuild
 
 # schemata
 mkdir -p %{buildroot}%{_datadir}/osbuild/schemas
-install -p -m 0755 $(find schemas/*.json) %{buildroot}%{_datadir}/osbuild/schemas
+install -p -m 0644 $(find schemas/*.json) %{buildroot}%{_datadir}/osbuild/schemas
 ln -s %{_datadir}/osbuild/schemas %{buildroot}%{pkgdir}/schemas
 
 # documentation
@@ -123,8 +206,25 @@ install -p -m 0644 -t %{buildroot}%{_mandir}/man1/ docs/*.1
 install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5
 
 # SELinux
-install -D -m 644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
+install -D -m 0644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
-install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
+install -D -m 0644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
+install -D -p -m 0644 selinux/osbuild.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if
+
+# Udev rules
+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}
+
+# Install `osbuild-depsolve-dnf` into libexec
+mkdir -p %{buildroot}%{_libexecdir}
+# Fedora 40 and later use dnf5-json, RHEL and Fedora < 40 use dnf-json
+%if 0%{?fedora} >= 40
+install -p -m 0755 tools/osbuild-depsolve-dnf5 %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
+%else
+install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
+%endif
 
 %check
 exit 0
@@ -138,28 +238,50 @@ exit 0
 %{_mandir}/man5/%{name}-manifest.5*
 %{_datadir}/osbuild/schemas
 %{pkgdir}
+%{_udevrulesdir}/*.rules
+# the following files are in the lvm2 sub-package
+%exclude %{pkgdir}/devices/org.osbuild.lvm2*
+%exclude %{pkgdir}/stages/org.osbuild.lvm2*
+# the following files are in the luks2 sub-package
+%exclude %{pkgdir}/devices/org.osbuild.luks2*
+%exclude %{pkgdir}/stages/org.osbuild.crypttab
+%exclude %{pkgdir}/stages/org.osbuild.luks2*
 # the following files are in the ostree sub-package
-%exclude %{pkgdir}/assemblers/org.osbuild.ostree.commit
+%exclude %{pkgdir}/assemblers/org.osbuild.ostree*
-%exclude %{pkgdir}/sources/org.osbuild.ostree
+%exclude %{pkgdir}/inputs/org.osbuild.ostree*
-%exclude %{pkgdir}/stages/org.osbuild.ostree
+%exclude %{pkgdir}/sources/org.osbuild.ostree*
+%exclude %{pkgdir}/stages/org.osbuild.ostree*
+%exclude %{pkgdir}/stages/org.osbuild.experimental.ostree*
 %exclude %{pkgdir}/stages/org.osbuild.rpm-ostree
 
 %files -n       python3-%{pypi_name}
 %license LICENSE
-%doc README.md NEWS.md
+%doc README.md
 %{python3_sitelib}/%{pypi_name}-*.egg-info/
 %{python3_sitelib}/%{pypi_name}/
 
+%files lvm2
+%{pkgdir}/devices/org.osbuild.lvm2*
+%{pkgdir}/stages/org.osbuild.lvm2*
+
+%files luks2
+%{pkgdir}/devices/org.osbuild.luks2*
+%{pkgdir}/stages/org.osbuild.crypttab
+%{pkgdir}/stages/org.osbuild.luks2*
+
 %files ostree
-%{pkgdir}/assemblers/org.osbuild.ostree.commit
+%{pkgdir}/assemblers/org.osbuild.ostree*
-%{pkgdir}/sources/org.osbuild.ostree
+%{pkgdir}/inputs/org.osbuild.ostree*
-%{pkgdir}/stages/org.osbuild.ostree
+%{pkgdir}/sources/org.osbuild.ostree*
+%{pkgdir}/stages/org.osbuild.ostree*
+%{pkgdir}/stages/org.osbuild.experimental.ostree*
 %{pkgdir}/stages/org.osbuild.rpm-ostree
 
 %files selinux
 %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
 %{_mandir}/man8/%{name}_selinux.8.*
-%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
+%{_datadir}/selinux/devel/include/distributed/%{name}.if
+%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
 
 %post selinux
 %selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
@@ -172,8 +294,260 @@ fi
 %posttrans selinux
 %selinux_relabel_post -s %{selinuxtype}
 
+%files tools
+%{_bindir}/osbuild-mpp
+%{?fedora:%{_bindir}/osbuild-dev}
+
+%files depsolve-dnf
+%{_libexecdir}/osbuild-depsolve-dnf
 
 %changelog
+* Wed Mar 27 2024 Eduard Abdullin <eabdullin@almalinux.org> - 110-1.alma
+- Add AlmaLinux runners
+
+* Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 110-1
+- New upstream release
+* Thu Feb 22 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 109-1
+- New upstream release
+
+* Thu Feb 01 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 106-1
+- New upstream release
+
+* Wed Jan 31 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 105-1
+- New upstream release
+
+* Wed Jan 17 2024 Paweł Poławski <ppolawsk@redhat.com> - 104-2
+- Fix unit tests in RHEL CI by backporting upstream fixes
+
+* Tue Jan 16 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 104-1
+- New upstream release
+
+* Tue Dec 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
+- New upstream release
+
+* Mon Dec 11 2023 Paweł Poławski <ppolawsk@redhat.com> - 100-2
+- Change unit-test timeout from 3h to 4h
+
+* Fri Nov 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
+- New upstream release
+
+* Wed Sep 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 96-1
+- New upstream release
+
+* Wed Sep 13 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 95-1
+- New upstream release
+
+* Wed Aug 30 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 94-1
+- New upstream release
+
+* 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
+
+* Mon Feb 20 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 80-1
+- New upstream release
+
+* Wed Feb 15 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 79-1
+- New upstream release
+
+* Tue Feb 07 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 78-1
+- New upstream release
+
+* Fri Jan 20 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1
+- New upstream release
+
+* Thu Jan 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 76-1
+- New upstream release
+
+* Wed Jan 04 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
+- New upstream release
+
+* Wed Dec 07 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 73-1
+- New upstream release
+
+* Wed Nov 23 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 72-1
+- New upstream release
+
+* Wed Nov 09 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 71-1
+- New upstream release
+
+* Wed Oct 26 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 70-1
+- New upstream release
+
+* Fri Aug 26 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 65-1
+- New upstream release
+
+* Thu Aug 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 64-1
+- New upstream release
+
+* Wed Aug 03 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 63-1
+- New upstream release
+
+* Wed Jul 27 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 62-1
+- New upstream release
+
+* Wed Jul 20 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 61-1
+- New upstream release
+
+* Thu Jul 07 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
+- New upstream release
+
+* Wed Jun 22 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
+- New upstream release
+
+* Wed Jun 08 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
+- New upstream release
+
+* Thu May 26 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
+- New upstream release
+
+* Wed May 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 56-1
+- New upstream release
+
+* Wed Apr 27 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 55-1
+- New upstream release
+
+* Fri Apr 15 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
+- New upstream release
+
+* Thu Mar 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
+- New upstream release
+
+* Tue Mar 08 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 52-1
+- New upstream release
+
+* Sun Feb 27 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 50-1
+- New upstream release
+
+* Wed Feb 23 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 49-1
+- New upstream release
+
+* Thu Feb 17 2022 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 48-1
+- New upstream release
+
+* Thu Feb 03 2022 Jacob Kozol <jacobdkozol@gmail.com> - 47-1
+- New upstream release
+
+* Wed Jan 19 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46-1
+- New upstream release
+
+* Mon Jan 10 2022 Tomas Hozza <thozza@redhat.com> - 45-1
+- New upstream release
+
+* Wed Jan 05 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 44-1
+- New upstream release
+
+* Wed Dec 01 2021 Achilleas Koutsou <achilleas@redhat.com> - 43-1
+- New upstream release
+
+* Mon Nov 29 2021 Ondřej Budai <ondrej@budai.cz> - 42-1
+- New upstream release
+
+* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 39-1
+- New upstream release
+
+* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 35-1
+- Upstream release 35
+
+* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 34-1
+- Upstream release 34
+
+* Wed Aug 25 2021 Tom Gundersen <teg@jklm.no> - 33-1
+- Upstream release 33
+
+* Tue Aug 24 2021 Tom Gundersen <teg@jklm.no> - 32-1
+- Upstream release 32
+
+* Mon Aug 23 2021 Tom Gundersen <teg@jklm.no> - 31-1
+- Upstream release 31
+
+* Fri Jul 23 2021 Christian Kellner <christian@kellner.me> - 30-1
+- Upstream release 30
+- Ship osbuild-mpp in new tools sub-package.
+- Remove executable bit from schemata files.
+
+* Tue Apr 27 2021 Achilleas Koutsou <achilleas@redhat.com> - 28-1
+- Upstream release 28
+- Includes fixes and feature additions for multiple stages.
+
+* Fri Feb 19 2021 Christian Kellner <ckellner@redhat.com> - 26-1
+- Upstream release 26
+- Includes the necessary stages to build boot isos.
+
+* Fri Feb 12 2021 Christian Kellner <ckellner@redhat.com> - 25-1
+- Upstream 25 release
+- First tech preview of the new manifest format. Includes
+  various new stages and inputs to be able to build ostree
+  commits contained in a oci archive.
+
+* Thu Jan 28 2021 Christian Kellner <ckellner@redhat.com> - 24-1
+- Upstream 24 release
+- Include new `Input` modules.
+
+* Mon Nov 23 2020 Christian Kellner <ckellner@redhat.com> - 23-3
+- only disable the dep. generator for runners, remove explicity
+  python3 requirement again. The dependency should be picked up
+  via the dependency generator now.
+
+* Fri Nov 13 2020 Christian Kellner <ckellner@redhat.com> - 23-2
+- Explicilty require python3. See the comment above the Requires
+  for an explanation why this is needed.
+
+* Fri Oct 23 2020 Christian Kellner <ckellner@redhat.com> - 23-1
+- Upstream release 23
+- Do not mangle shebangs for assemblers, runners & stages.
+
+* Wed Oct 14 2020 Christian Kellner <ckellner@redhat.com> - 22-1
+- Upstream release 22
+- Remove all patches since they are all in osbuild-22.
+- bubblewrap replaced systemd-nspawn for sandboxing; change the
+  requirements accordingly.
+
+* Thu Aug 13 2020 Christian Kellner <ckellner@redhat.com> - 18-3
+- Add patch to allow nnp and nosuid domain transitions
+  https://github.com/osbuild/osbuild/pull/495
+
 * Fri Jun 26 2020 Christian Kellner <ckellner@redhat.com> - 18-2
 - Add patch to not pass floats to curl in the files source
   https://github.com/osbuild/osbuild/pull/459