.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-93.tar.gz
+SOURCES/osbuild-65.tar.gz

.osbuild.metadata

@@ -1 +1 @@
-4ef37f2c681bcf4f4ae6099726b1617fe1db471e SOURCES/osbuild-93.tar.gz
+cc3ac24219b1619c999858d3f61c6a7be8d50732 SOURCES/osbuild-65.tar.gz

SOURCES/almalinux_runners.patch

@@ -0,0 +1,139 @@
+diff -aruN osbuild-53/runners/org.osbuild.almalinux86 osbuild-53_alma/runners/org.osbuild.almalinux86
+--- osbuild-53/runners/org.osbuild.almalinux86	1970-01-01 02:00:00.000000000 +0200
++++ osbuild-53_alma/runners/org.osbuild.almalinux86	2022-03-24 02:05:32.000000000 +0300
+@@ -0,0 +1,83 @@
++#!/usr/libexec/platform-python
++
++import os
++import platform
++import subprocess
++import sys
++
++import osbuild.api
++
++
++def quirks():
++    # Platform specific quirks
++    env = os.environ.copy()
++
++    if platform.machine() == "aarch64":
++        # Work around a bug in qemu-img on aarch64 that can lead to qemu-img
++        # hangs when more then one coroutine is use (which is the default)
++        # See https://bugs.launchpad.net/qemu/+bug/1805256
++        env["OSBUILD_QEMU_IMG_COROUTINES"] = "1"
++
++    return env
++
++
++def ldconfig():
++    # ld.so.conf must exist, or `ldconfig` throws a warning
++    subprocess.run(["touch", "/etc/ld.so.conf"], check=True)
++    subprocess.run(["ldconfig"], check=True)
++
++
++def sysusers():
++    try:
++        subprocess.run(["systemd-sysusers"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
++    except subprocess.CalledProcessError as error:
++        sys.stderr.write(error.stdout)
++        sys.exit(1)
++
++
++def tmpfiles():
++    # Allow systemd-tmpfiles to return non-0. Some packages want to create
++    # directories owned by users that are not set up with systemd-sysusers.
++    subprocess.run(["systemd-tmpfiles", "--create"], check=False)
++
++
++def nsswitch():
++    # the default behavior is fine, but using nss-resolve does not
++    # necessarily work in a non-booted container, so make sure that
++    # is not configured.
++    try:
++        os.remove("/etc/nsswitch.conf")
++    except FileNotFoundError:
++        pass
++
++
++def python_alternatives():
++    """/usr/bin/python3 is a symlink to /etc/alternatives/python3, which points
++    to /usr/bin/python3.6 by default. Recreate the link in /etc, so that
++    shebang lines in stages and assemblers work.
++    """
++    os.makedirs("/etc/alternatives", exist_ok=True)
++    try:
++        os.symlink("/usr/bin/python3.6", "/etc/alternatives/python3")
++    except FileExistsError:
++        pass
++
++
++def main():
++    with osbuild.api.exception_handler():
++        ldconfig()
++        sysusers()
++        tmpfiles()
++        nsswitch()
++        python_alternatives()
++
++        env = quirks()
++
++        r = subprocess.run(sys.argv[1:],
++                           env=env,
++                           check=False)
++        sys.exit(r.returncode)
++
++
++if __name__ == "__main__":
++    main()
+diff -aruN osbuild-53/runners/org.osbuild.almalinux90 osbuild-53_alma/runners/org.osbuild.almalinux90
+--- osbuild-53/runners/org.osbuild.almalinux90	1970-01-01 02:00:00.000000000 +0200
++++ osbuild-53_alma/runners/org.osbuild.almalinux90	2022-03-24 02:05:32.000000000 +0300
+@@ -0,0 +1,48 @@
++#!/usr/bin/python3
++
++import os
++import subprocess
++import sys
++
++import osbuild.api
++
++
++def ldconfig():
++    # ld.so.conf must exist, or `ldconfig` throws a warning
++    subprocess.run(["touch", "/etc/ld.so.conf"], check=True)
++    subprocess.run(["ldconfig"], check=True)
++
++
++def sysusers():
++    try:
++        subprocess.run(["systemd-sysusers"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
++    except subprocess.CalledProcessError as error:
++        sys.stderr.write(error.stdout)
++        sys.exit(1)
++
++
++def tmpfiles():
++    # Allow systemd-tmpfiles to return non-0. Some packages want to create
++    # directories owned by users that are not set up with systemd-sysusers.
++    subprocess.run(["systemd-tmpfiles", "--create"], check=False)
++
++
++def nsswitch():
++    # the default behavior is fine, but using nss-resolve does not
++    # necessarily work in a non-booted container, so make sure that
++    # is not configured.
++    try:
++        os.remove("/etc/nsswitch.conf")
++    except FileNotFoundError:
++        pass
++
++
++if __name__ == "__main__":
++    with osbuild.api.exception_handler():
++        ldconfig()
++        sysusers()
++        tmpfiles()
++        nsswitch()
++
++        r = subprocess.run(sys.argv[1:], check=False)
++        sys.exit(r.returncode)

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

@@ -1,35 +0,0 @@
-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:        93
+Version:        65
 
 %forgemeta
 
@@ -9,17 +9,16 @@ Version:        93
 %global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Release:        1%{?dist}.1
-License:        Apache-2.0
+Release:        1%{?dist}.alma
+License:        ASL 2.0
 
 URL:            %{forgeurl}
 
 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
+# AlmaLinux patch
+Patch10000:     almalinux_runners.patch
 
 BuildRequires:  make
 BuildRequires:  python3-devel
@@ -36,7 +35,6 @@ Requires:       glibc
 Requires:       policycoreutils
 Requires:       qemu-img
 Requires:       systemd
-Requires:       skopeo
 Requires:       tar
 Requires:       util-linux
 Requires:       python3-%{pypi_name} = %{version}-%{release}
@@ -104,8 +102,7 @@ to build OSTree based images.
 %package        selinux
 Summary:        SELinux policies
 Requires:       %{name} = %{version}-%{release}
-Requires:       selinux-policy-%{selinuxtype}
-Requires(post): selinux-policy-%{selinuxtype}
+BuildRequires:  selinux-policy
 BuildRequires:  selinux-policy-devel
 %{?selinux_requires}
 
@@ -119,19 +116,14 @@ 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
-%forgeautosetup -p1
+%forgesetup
+# AlmaLinux patch
+%patch10000 -p1 -b .runners
 
 %build
 %py3_build
@@ -141,7 +133,7 @@ make man
 make -f /usr/share/selinux/devel/Makefile osbuild.pp
 bzip2 -9 osbuild.pp
 
-%pre selinux
+%pre
 %selinux_relabel_pre -s %{selinuxtype}
 
 %install
@@ -185,15 +177,11 @@ install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5
 # SELinux
 install -D -m 0644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
 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}
-
 %check
 exit 0
 # We have some integration tests, but those require running a VM, so that would
@@ -246,8 +234,7 @@ exit 0
 %files selinux
 %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
 %{_mandir}/man8/%{name}_selinux.8.*
-%{_datadir}/selinux/devel/include/distributed/%{name}.if
-%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
+%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
 
 %post selinux
 %selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
@@ -262,87 +249,11 @@ fi
 
 %files tools
 %{_bindir}/osbuild-mpp
-%{?fedora:%{_bindir}/osbuild-dev}
 
 
 %changelog
-* 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
-
-* 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
+* Tue Nov 15 2022 Eduard Abdullin <eabdullin@almalinux.org> - 65-1.alma
+- Add AlmaLinux runners
 
 * Fri Aug 26 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 65-1
 - New upstream release
@@ -359,7 +270,7 @@ fi
 * 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
+* Wed Jul 06 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
@@ -368,7 +279,7 @@ fi
 * 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
+* Wed May 25 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
@@ -377,13 +288,13 @@ fi
 * 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
+* Wed Apr 13 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
+* Fri Mar 04 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 52-1
 - New upstream release
 
 * Sun Feb 27 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 50-1
@@ -392,90 +303,112 @@ fi
 * 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
+* Wed Feb 16 2022 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 48-1
 - New upstream release
 
-* Thu Feb 03 2022 Jacob Kozol <jacobdkozol@gmail.com> - 47-1
+* Wed Feb 02 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
+* Fri Jan 07 2022 Tomas Hozza <thozza@redhat.com> - 45-1
 - New upstream release
 
-* Wed Jan 05 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 44-1
+* Thu Dec 16 2021 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 44-1
 - New upstream release
 
-* Wed Dec 01 2021 Achilleas Koutsou <achilleas@redhat.com> - 43-1
+* Wed Dec 01 2021 Achilleas Koutsou <achilleas@koutsou.net> - 43-1
 - New upstream release
 
-* Mon Nov 29 2021 Ondřej Budai <ondrej@budai.cz> - 42-1
+* Wed Nov 17 2021 'Gianluca Zuccarelli' <'<gzuccare@redhat.com>'> - 42-1
 - New upstream release
 
-* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 39-1
+* Thu Oct 07 2021 Simon Steinbeiß <simon.steinbeiss@redhat.com> - 39-1
 - New upstream release
 
-* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 35-1
+* Sun Aug 29 2021 Tom Gundersen <tgunders@redhat.com> - 35-1
 - Upstream release 35
 
-* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 34-1
+* Sun Aug 29 2021 Tom Gundersen <tgunders@redhat.com> - 34-1
 - Upstream release 34
 
-* Wed Aug 25 2021 Tom Gundersen <teg@jklm.no> - 33-1
+* Wed Aug 25 2021 Tom Gundersen <tgunders@redhat.com> - 33-1
 - Upstream release 33
 
-* Tue Aug 24 2021 Tom Gundersen <teg@jklm.no> - 32-1
+* Tue Aug 24 2021 Tom Gundersen <tgunders@redhat.com> - 32-1
 - Upstream release 32
 
-* Mon Aug 23 2021 Tom Gundersen <teg@jklm.no> - 31-1
+* Mon Aug 23 2021 Tom Gundersen <tgunders@redhat.com> - 31-1
 - Upstream release 31
 
-* Fri Jul 23 2021 Christian Kellner <christian@kellner.me> - 30-1
+* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 30-1
 - Upstream release 30
-- Ship osbuild-mpp in new tools sub-package.
-- Remove executable bit from schemata files.
+- Many new stages for building ostree-based raw images
+- Bootiso.mono stage was deprecated and split into smaller stages
+- Mounts are now represented as an array in a manifest
+- Various bug fixes and improvements to various stages
 
-* Tue Apr 27 2021 Achilleas Koutsou <achilleas@redhat.com> - 28-1
-- Upstream release 28
-- Includes fixes and feature additions for multiple stages.
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri Feb 19 2021 Christian Kellner <ckellner@redhat.com> - 26-1
+* Tue Jun 29 2021 Ondřej Budai <ondrej@budai.cz> - 29-1
+- Upstream release 29
+- Adds host services
+- Adds modprobe and logind stage
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 27-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Mar 17 2021 Christian Kellner <ckellner@redhat.com> - 27-2
+- Include Fedora 35 runner (upstream commit 337e0f0)
+
+* Tue Mar 16 2021 Christian Kellner <ckellner@redhat.com> - 27-1
+- Upstream release 27
+- Various bug fixes related to the new container and installer
+  stages introdcued in version 25 and 26.
+
+* Sat Feb 20 2021 Christian Kellner <ckellner@redhat.com> - 26-1
 - Upstream release 26
-- Includes the necessary stages to build boot isos.
+- Support for building boot isos
+- Grub stage gained support for 'saved_entry' to fix grub tooling
 
 * Fri Feb 12 2021 Christian Kellner <ckellner@redhat.com> - 25-1
-- Upstream 25 release
+- Upstream release 25
 - 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.
+- Upstream release 24
+- Turn on dependency generator for everything but runners
+- Include new 'input' binaries
 
-* 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.
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * 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
+* Mon Oct 12 2020 Christian Kellner <ckellner@redhat.com> - 22-1
 - Upstream release 22
-- Remove all patches since they are all in osbuild-22.
+
+* Thu Sep 10 2020 Christian Kellner <ckellner@redhat.com> - 21-1
+- Upstream reelase 21
+
+* Thu Aug 13 2020 Christian Kellner <ckellner@redhat.com> - 20-1
+- Upstream reelase 20
+
+* Fri Aug  7 2020 Christian Kellner <ckellner@redhat.com> - 19-1
+- Upstream release 19
+- Drop no-floats-in-sources.patch included in release 19
 - 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
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
 * Fri Jun 26 2020 Christian Kellner <ckellner@redhat.com> - 18-2
 - Add patch to not pass floats to curl in the files source
@@ -486,54 +419,80 @@ fi
 - All RHEL runners now use platform-python.
 
 * Wed Jun 10 2020 Christian Kellner <ckellner@redhat.com> - 17-1
-- Upstream release 17
+- new upstream relaese 17
 - Add custom SELinux policy that lets osbuild set labels inside
   the build root that are unknown to the host.
 
-* Thu Jun  4 2020 Christian Kellner <christian@kellner.me> - 16-1
-- Upstream release 16
+* Thu Jun  4 2020 Christian Kellner <ckellner@redhat.com> - 16-1
+- new upstream release 16
 - Drop sources-fix-break-when-secrets-is-None.patch included in
-  osbuild-16.
+  the new upstream reelase.
 
-* Tue May 26 2020 Christian Kellner <ckellner@redhat.com> - 15-2
+* Wed May 27 2020 Miro Hrončok <mhroncok@redhat.com> - 15-4
+- Rebuilt for Python 3.9
+
+* Tue May 26 2020 Christian Kellner <ckellner@redhat.com> - 15-3
 - Add a patch to allow org.osbuild.files source in the new format
   but without actually containing the secrets key.
   Taken from merged PR: https://github.com/osbuild/osbuild/pull/416
 
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 15-2
+- Rebuilt for Python 3.9
+
 * Thu May 21 2020 Christian Kellner <ckellner@redhat.com> - 15-1
-- New upstream release 15
-- Drop draft4-validator.json patch, included in osbuild-15
+- new upstream release 15
 
-* Wed May 13 2020 Christian Kellner <ckellner@redhat.com> - 14-2
-- Add draft4-validator.json patch
-  python3-jsonschema in RHEL currently has version 2.6.0 which
-  has support validating up to and including draft4 of jsonschema.
-  See https://github.com/osbuild/osbuild/pull/394
-
-* Wed May 13 2020 Christian Kellner <ckellner@redhat.com> - 14-1
-- Upstream release 14
+* Wed May  6 2020 Christian Kellner <christian@kellner.me> - 14-2
 - Install schemata to <datadir>/osbuild/schemas and include a
   symlink to it in /usr/lib/osbuild/schemas
+
+* Wed May  6 2020 Christian Kellner <christian@kellner.me> - 14-1
+- new upstream release 14
 - The directories /usr/lib/osbuild/{assemblers, stages}/osbuild
   got removed. Changes to osbuild made them obsolete.
 
 * Wed Apr 15 2020 Christian Kellner <ckellner@redhat.com> - 12-1
-- Sync with Fedora and use upstream release 12
+- new upstream release 12
 - Specify the exact version in the 'python3-osbuild' requirement
   to avoid the library and the main binary being out of sync.
 - osbuild-ostree sub-package with the necessary bits to create
   OSTree based images
-- Turn off dependency generator for internal components
-- Add NEWS.md file with the release notes and man pages
 
-* Mon Dec 16 2019 Lars Karlitski <lars@karlitski.net> - 7-1
-- New upstream release
+* Thu Apr  2 2020 Christian Kellner <ckellner@redhat.com> - 11-1
+- new upstream release 11
+- Turn of dependency generator for internal components
 
-* Sun Dec 1 2019 Tom Gundersen <teg@jklm.no> - 6-2
-- New upstream release
+* Thu Mar 19 2020 Christian Kellner <ckellner@redhat.com> - 10-1
+- new upstream release 10
+- build and include man pages, this adds 'make' and 'python3-docutils'
+  to the build requirements
+- add NEWS.md file with the release notes
 
-* Thu Oct 24 2019 Lars Karlitski <lueberni@redhat.com> - 3-2
-- add gating infra and tests
+* Thu Mar  5 2020 Christian Kellner <ckellner@redhat.com> - 9-1
+- new upstream release: 9
+- Remove host runner link, it now is being auto-detected
+- Cleanup use of mixed use of spaces/tabs
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 16 2019 Packit Service <user-cont-team+packit-service@redhat.com> - 7-1
+- new upstream release: 7
+
+* Sat Nov 30 2019 Tom Gundersen <teg@jklm.no> - 6-1
+- new upstream release: 6
+
+* Wed Oct 30 2019 Lars Karlitski <lars@karlitski.net> - 5-1
+- new upstream release: 5
+
+* Wed Oct 16 2019 Tom Gundersen <tgunders@redhat.com> - 4-1
+- new upstream release: 4
+
+* Fri Oct 04 2019 Lars Karlitski <lars@karlitski.net> - 3-1
+- new upstream release: 3
+
+* Wed Sep 18 2019 Martin Sehnoutka <msehnout@redhat.com> - 2-1
+- new upstream release: 2
 
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1-3
 - Rebuilt for Python 3.8