From 33d4c898e08d190dcde73bbbd842d3a8f3e8cbb9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 09 2020 20:01:10 +0000
Subject: import osbuild-16-1.el8


---

diff --git a/.gitignore b/.gitignore
index 87affa5..dd7a6c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osbuild-12.tar.gz
+SOURCES/osbuild-16.tar.gz
diff --git a/.osbuild.metadata b/.osbuild.metadata
index fb72d92..76ea34f 100644
--- a/.osbuild.metadata
+++ b/.osbuild.metadata
@@ -1 +1 @@
-a554941f5652407196cb9ec6d9919c8de7bf11e8 SOURCES/osbuild-12.tar.gz
+fab7501d09204678e86b07aed347ab646589b9c8 SOURCES/osbuild-16.tar.gz
diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec
index 4f1a2c9..4f04d4b 100644
--- a/SPECS/osbuild.spec
+++ b/SPECS/osbuild.spec
@@ -1,6 +1,6 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 
-Version:        12
+Version:        16
 
 %forgemeta
 
@@ -85,9 +85,13 @@ 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
 
-# mount points for bind mounting the osbuild library
-mkdir -p %{buildroot}%{pkgdir}/stages/osbuild
-mkdir -p %{buildroot}%{pkgdir}/assemblers/osbuild
+# 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
+ln -s %{_datadir}/osbuild/schemas %{buildroot}%{pkgdir}/schemas
 
 # documentation
 mkdir -p %{buildroot}%{_mandir}/man1
@@ -105,6 +109,7 @@ exit 0
 %{_bindir}/osbuild
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man5/%{name}-manifest.5*
+%{_datadir}/osbuild/schemas
 %{pkgdir}
 # the following files are in the ostree sub-package
 %exclude %{pkgdir}/assemblers/org.osbuild.ostree.commit
@@ -118,13 +123,40 @@ exit 0
 %{python3_sitelib}/%{pypi_name}-*.egg-info/
 %{python3_sitelib}/%{pypi_name}/
 
-%files          ostree
+%files ostree
 %{pkgdir}/assemblers/org.osbuild.ostree.commit
 %{pkgdir}/sources/org.osbuild.ostree
 %{pkgdir}/stages/org.osbuild.ostree
 %{pkgdir}/stages/org.osbuild.rpm-ostree
 
 %changelog
+* Thu Jun  4 2020 Christian Kellner <christian@kellner.me> - 16-1
+- Upstream release 16
+- Drop sources-fix-break-when-secrets-is-None.patch included in
+  osbuild-16.
+
+* Tue May 26 2020 Christian Kellner <ckellner@redhat.com> - 15-2
+- 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
+
+* Thu May 21 2020 Christian Kellner <ckellner@redhat.com> - 15-1
+- New upstream release 15
+- Drop draft4-validator.json patch, included in osbuild-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
+- Install schemata to <datadir>/osbuild/schemas and include a
+  symlink to it in /usr/lib/osbuild/schemas
+- 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
 - Specify the exact version in the 'python3-osbuild' requirement
@@ -134,7 +166,7 @@ exit 0
 - Turn off dependency generator for internal components
 - Add NEWS.md file with the release notes and man pages
 
-* Sun Dec 16 2019 Lars Karlitski <lars@karlitski.net> - 7-1
+* Mon Dec 16 2019 Lars Karlitski <lars@karlitski.net> - 7-1
 - New upstream release
 
 * Sun Dec 1 2019 Tom Gundersen <teg@jklm.no> - 6-2