diff options
| author | Todd Zullinger <tmz@pobox.com> | 2011-03-16 10:38:27 -0400 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2011-03-16 10:38:27 -0400 |
| commit | 930375d8ab5dad56de1d366a983e2e3828e3f9ae (patch) | |
| tree | 4b0744cfc3414a4d6726e9e62cc19c61a5dd68f7 | |
| parent | 6e7f2a531d1b3e2cdd517de0d477d2cb143f5ae1 (diff) | |
| download | puppet-package-930375d8ab5dad56de1d366a983e2e3828e3f9ae.tar.gz puppet-package-930375d8ab5dad56de1d366a983e2e3828e3f9ae.tar.xz puppet-package-930375d8ab5dad56de1d366a983e2e3828e3f9ae.zip | |
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.
| -rw-r--r-- | 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@lists.fedoraproject.org> - 0.25.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild |