diff --git a/.gitignore b/.gitignore index 760035d..73a55a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-65.tar.gz +SOURCES/osbuild-70.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index 75712a3..63d7b21 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -cc3ac24219b1619c999858d3f61c6a7be8d50732 SOURCES/osbuild-65.tar.gz +c9616ed8fd2f315f9c75f703e02be913ce8cb489 SOURCES/osbuild-70.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 88d1570..5cb4dd2 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 65 +Version: 70 %forgemeta @@ -100,7 +100,8 @@ to build OSTree based images. %package selinux Summary: SELinux policies Requires: %{name} = %{version}-%{release} -BuildRequires: selinux-policy +Requires: selinux-policy-%{selinuxtype} +Requires(post): selinux-policy-%{selinuxtype} BuildRequires: selinux-policy-devel %{?selinux_requires} @@ -129,7 +130,7 @@ make man make -f /usr/share/selinux/devel/Makefile osbuild.pp bzip2 -9 osbuild.pp -%pre +%pre selinux %selinux_relabel_pre -s %{selinuxtype} %install @@ -173,6 +174,7 @@ 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} @@ -230,7 +232,8 @@ exit 0 %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 %{_mandir}/man8/%{name}_selinux.8.* -%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} +%{_datadir}/selinux/devel/include/distributed/%{name}.if +%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} %post selinux %selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 @@ -248,6 +251,9 @@ fi %changelog +* Wed Oct 26 2022 imagebuilder-bots+imagebuilder-bot@redhat.com - 70-1 +- New upstream release + * Fri Aug 26 2022 imagebuilder-bot - 65-1 - New upstream release