Skip to content

Commit

Permalink
build/ops: rpm: selinux-policy fixes
Browse files Browse the repository at this point in the history
Requiring the file /usr/share/selinux/devel/policyhelp breaks fc27 and
Rawhide builds as they do not have that file. This exposed the fact this
code had not worked in some time due to changes in selinux policy
modules packaging. See
https://bugzilla.redhat.com/show_bug.cgi?id=999584

Signed-off-by: Brad Hubbard <[email protected]>
  • Loading branch information
badone committed Nov 22, 2017
1 parent c662dc3 commit ee4f172
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions ceph.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

%if %{with selinux}
# get selinux policy version
%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null || echo 0.0.0)}
%{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0}
%endif

%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
Expand Down Expand Up @@ -100,7 +100,6 @@ BuildRequires: sharutils
%if 0%{with selinux}
BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: /usr/share/selinux/devel/policyhelp
%endif
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
Expand Down

0 comments on commit ee4f172

Please sign in to comment.