Skip to content

Commit

Permalink
rpm: ship manpage
Browse files Browse the repository at this point in the history
manpage ownership no longer conflicts with selinux-policy.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2282098
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2209120

Signed-off-by: Lokesh Mandvekar <[email protected]>
  • Loading branch information
lsm5 committed Nov 11, 2024
1 parent 8ba68ee commit cd0a175
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion container.te
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
policy_module(container, 2.234.1)
policy_module(container, 2.234.2)

gen_require(`
class passwd rootok;
Expand Down
5 changes: 1 addition & 4 deletions rpm/container-selinux.spec
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ make
%_format MODULES $x.pp.bz2
%{__make} DATADIR=%{buildroot}%{_datadir} SYSCONFDIR=%{buildroot}%{_sysconfdir} install install.udica-templates install.selinux-user

# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2209120
rm %{buildroot}%{_mandir}/man8/container_selinux.8

%pre
%selinux_relabel_pre

Expand Down Expand Up @@ -126,7 +123,7 @@ fi
%dir %{_datadir}/udica/templates/
%{_datadir}/udica/templates/*
# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2209120
#%%{_mandir}/man8/container_selinux.8.gz
%{_mandir}/man8/container_selinux.8.gz
%{_sysconfdir}/selinux/targeted/contexts/users/container_u
%ghost %verify(not mode) %{_selinux_store_path}/targeted/active/modules/200/%{modulenames}
%ghost %verify(not mode) %{_selinux_store_path}/mls/active/modules/200/%{modulenames}
Expand Down

0 comments on commit cd0a175

Please sign in to comment.