[puppet] Require libselinux-utils when selinux support is enabled

Todd Zullinger tmz at fedoraproject.org
Fri Mar 18 15:20:29 UTC 2011


commit 930375d8ab5dad56de1d366a983e2e3828e3f9ae
Author: Todd Zullinger <tmz at pobox.com>
Date:   Wed Mar 16 10:38:27 2011 -0400

    Require libselinux-utils when selinux support is enabled
    
    Some of the selinux types/providers call binaries from libselinux-utils
    directly.  Ideally, these would be converted to use the ruby bindings,
    but it is not clear if that is feasible at this time.

 puppet.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/puppet.spec b/puppet.spec
index f3776ec..8bd2f2c 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -27,11 +27,11 @@ Requires:       ruby-shadow
 %endif
 
 # Pull in ruby selinux bindings where available
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-%{!?_without_selinux:Requires: ruby(selinux)}
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%{!?_without_selinux:Requires: ruby(selinux), libselinux-utils}
 %else
-%if 0%{?fedora} || 0%{?rhel} >= 5
-%{!?_without_selinux:Requires: libselinux-ruby}
+%if 0%{?rhel} && 0%{?rhel} == 5
+%{!?_without_selinux:Requires: libselinux-ruby, libselinux-utils}
 %endif
 %endif
 
@@ -249,6 +249,7 @@ rm -rf %{buildroot}
 - Fix License tag, puppet is now GPLv2 only
 - Create and own /usr/share/puppet/modules (#615432)
 - Properly restart puppet agent/master daemons on upgrades from 0.25.x
+- Require libselinux-utils when selinux support is enabled
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


More information about the scm-commits mailing list