diff --git a/.gitignore b/.gitignore index 63ab40d..8946754 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-29.tar.gz +SOURCES/osbuild-30.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index 03f4acc..b11ccef 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -70f8faac20dbc6868e28c9d3f0b2ce438dae7ab7 SOURCES/osbuild-29.tar.gz +22676cf29a1625243b5c8bc2125b290c3200f2c1 SOURCES/osbuild-30.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 07cfd96..530133a 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 29 +Version: 30 %forgemeta @@ -90,6 +90,14 @@ 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} + +%description tools +Contains additional tools and utilities for development of +manifests and osbuild. + %prep %forgesetup @@ -133,7 +141,7 @@ 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 @@ -143,8 +151,8 @@ 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 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8 +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 %check exit 0 @@ -194,8 +202,15 @@ fi %posttrans selinux %selinux_relabel_post -s %{selinuxtype} +%files tools +%{_bindir}/osbuild-mpp %changelog +* Fri Jul 23 2021 Christian Kellner - 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 - 28-1 - Upstream release 28 - Includes fixes and feature additions for multiple stages.