From: Brad Hubbard Date: Fri, 17 Nov 2017 01:54:38 +0000 (+1000) Subject: build/ops: rpm: selinux-policy fixes X-Git-Tag: v12.2.9~44^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8a04a7fd488ecb574a3b4a7a32735ff38a181ad;p=ceph.git build/ops: rpm: selinux-policy fixes 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 (cherry picked from commit ee4f172f983aaaa7f2c1b674084e0f12591bc0ea) --- diff --git a/ceph.spec.in b/ceph.spec.in index bb394f06b35d..e516de57b40d 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -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} @@ -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}