diff --git a/.gitignore b/.gitignore index 7c5ba62..63ab40d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-27.2.tar.gz +SOURCES/osbuild-29.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index 20d45b7..03f4acc 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -781efd5f4d96e25059c002a7e998429b9d682d03 SOURCES/osbuild-27.2.tar.gz +70f8faac20dbc6868e28c9d3f0b2ce438dae7ab7 SOURCES/osbuild-29.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 642005a..07cfd96 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 27.2 +Version: 29 %forgemeta @@ -56,10 +56,8 @@ Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) # /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} - %description A build system for OS images @@ -121,9 +119,15 @@ 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 @@ -155,9 +159,10 @@ exit 0 %{_datadir}/osbuild/schemas %{pkgdir} # the following files are in the ostree sub-package -%exclude %{pkgdir}/assemblers/org.osbuild.ostree.commit -%exclude %{pkgdir}/sources/org.osbuild.ostree -%exclude %{pkgdir}/stages/org.osbuild.ostree +%exclude %{pkgdir}/assemblers/org.osbuild.ostree* +%exclude %{pkgdir}/inputs/org.osbuild.ostree* +%exclude %{pkgdir}/sources/org.osbuild.ostree* +%exclude %{pkgdir}/stages/org.osbuild.ostree* %exclude %{pkgdir}/stages/org.osbuild.rpm-ostree %files -n python3-%{pypi_name} @@ -167,9 +172,10 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %files ostree -%{pkgdir}/assemblers/org.osbuild.ostree.commit -%{pkgdir}/sources/org.osbuild.ostree -%{pkgdir}/stages/org.osbuild.ostree +%{pkgdir}/assemblers/org.osbuild.ostree* +%{pkgdir}/inputs/org.osbuild.ostree* +%{pkgdir}/sources/org.osbuild.ostree* +%{pkgdir}/stages/org.osbuild.ostree* %{pkgdir}/stages/org.osbuild.rpm-ostree %files selinux @@ -190,18 +196,9 @@ fi %changelog -* Thu Apr 8 2021 Christian Kellner - 27.2-1 -- Upstream release 27.2. -- Support for explicitly selecting the qcow2 version. - -* Thu Apr 1 2021 Achilleas Koutsou - 27.1-1 -- Upstream release 27.1 -- Bug fixes related to OCI archive generation. - -* Tue Mar 16 2021 Christian Kellner - 27-1 -- Upstream release 27 -- Various bug fixes related to the new container and installer - stages introdcued in version 25 and 26. +* Tue Apr 27 2021 Achilleas Koutsou - 28-1 +- Upstream release 28 +- Includes fixes and feature additions for multiple stages. * Fri Feb 19 2021 Christian Kellner - 26-1 - Upstream release 26