aboutgitcodebugslistschat
path: root/contrib
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2023-03-29 13:17:31 +0200
committerStefano Brivio <sbrivio@redhat.com>2023-03-29 22:11:07 +0200
commitb10b983fbd00634e275083c37446a538dbff0dbe (patch)
treea1a879f362e20630ab92d5c1d95128f136389404 /contrib
parent387f4aca7477ee630fe3c261a19f5f1a9055bfe5 (diff)
downloadpasst-b10b983fbd00634e275083c37446a538dbff0dbe.tar
passt-b10b983fbd00634e275083c37446a538dbff0dbe.tar.gz
passt-b10b983fbd00634e275083c37446a538dbff0dbe.tar.bz2
passt-b10b983fbd00634e275083c37446a538dbff0dbe.tar.lz
passt-b10b983fbd00634e275083c37446a538dbff0dbe.tar.xz
passt-b10b983fbd00634e275083c37446a538dbff0dbe.tar.zst
passt-b10b983fbd00634e275083c37446a538dbff0dbe.zip
fedora: Adjust path for SELinux policy and interface file to latest guidelines2023_03_29.b10b983
Forget about: https://fedoraproject.org/wiki/SELinux_Policy_Modules_Packaging_Draft and: https://fedoraproject.org/wiki/PackagingDrafts/SELinux_Independent_Policy The guidelines to follow are: https://fedoraproject.org/wiki/SELinux/IndependentPolicy Start from fixing the most pressing issue, that is, a path conflict with policy-selinux-devel about passt.if, and, while at it, adjust the installation paths for policy files too. Reported-by: Xose Vazquez Perez <xose.vazquez@gmail.com> Link: https://bugzilla.redhat.com/show_bug.cgi?id=2182476 Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/fedora/passt.spec17
1 files changed, 8 insertions, 9 deletions
diff --git a/contrib/fedora/passt.spec b/contrib/fedora/passt.spec
index da1accb..3eb2e0e 100644
--- a/contrib/fedora/passt.spec
+++ b/contrib/fedora/passt.spec
@@ -62,17 +62,17 @@ ln -sr %{buildroot}%{_mandir}/man1/pasta.1 %{buildroot}%{_mandir}/man1/pasta.avx
pushd contrib/selinux
make -f %{_datadir}/selinux/devel/Makefile
-install -p -m 644 -D passt.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/passt.pp
-install -p -m 644 -D passt.if %{buildroot}%{_datadir}/selinux/devel/include/contrib/passt.if
-install -p -m 644 -D pasta.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/pasta.pp
+install -p -m 644 -D passt.pp %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/passt.pp
+install -p -m 644 -D passt.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/passt.if
+install -p -m 644 -D pasta.pp %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
popd
%pre selinux
%selinux_relabel_pre -s %{selinuxtype}
%post selinux
-%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{name}/passt.pp
-%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{name}/pasta.pp
+%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/passt.pp
+%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
%postun selinux
if [ $1 -eq 0 ]; then
@@ -102,10 +102,9 @@ fi
%endif
%files selinux
-%dir %{_datadir}/selinux/packages/%{name}
-%{_datadir}/selinux/packages/%{name}/passt.pp
-%{_datadir}/selinux/devel/include/contrib/passt.if
-%{_datadir}/selinux/packages/%{name}/pasta.pp
+%{_datadir}/selinux/packages/%{selinuxtype}/passt.pp
+%{_datadir}/selinux/devel/include/distributed/passt.if
+%{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
%changelog
{{{ passt_git_changelog }}}