diff --git a/.gitignore b/.gitignore index 7b74b1a..1ef2bf0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /osbuild-26.tar.gz /osbuild-27.tar.gz /osbuild-28.tar.gz +/osbuild-29.tar.gz diff --git a/osbuild.spec b/osbuild.spec index cf06744..939bf55 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 28 +Version: 29 %forgemeta @@ -9,7 +9,7 @@ Version: 28 %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Release: 2%{?dist} +Release: 1%{?dist} License: ASL 2.0 URL: %{forgeurl} @@ -119,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 @@ -153,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} @@ -165,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 @@ -186,7 +194,11 @@ fi %posttrans selinux %selinux_relabel_post -s %{selinuxtype} + %changelog +* Mon Jun 21 2021 msehnout - 29-1 +- Upstream release 29 + * Fri Jun 04 2021 Python Maint - 28-2 - Rebuilt for Python 3.10 diff --git a/sources b/sources index d9cd8f0..ea8f9fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-28.tar.gz) = 855b6db566f9c0011e76d143f83183ae09a00e338ada241fc27f9412b20f37ff36692ec30b28dc9542eb457ea2a4fbd0e351821270b5d79a870f697a686e0d88 +SHA512 (osbuild-29.tar.gz) = a65fdc574386a28410344b7b5218f8190990170b5e9600f81304a09c3a8dc82a0be8c9f8f3516d906a776470db4c531efefc8cf280c8cd0ef8c673995fba5366