From 05448476bc415b06d6457575a3cf5b2d7cdb1630 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 21 Feb 2012 08:35:06 -0500 Subject: [PATCH] Use ruby($lib) for augeas and shadow requirements This is more compatible with all Fedora and EPEL branches than using the ruby-$lib package name. --- puppet.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index a235f4c..1b57fda 100644 --- a/puppet.spec +++ b/puppet.spec @@ -38,7 +38,7 @@ BuildArch: noarch %if "%{ruby_version}" Requires: ruby(abi) = %{ruby_version} %endif -Requires: ruby-shadow +Requires: ruby(shadow) %endif # Pull in ruby selinux bindings where available @@ -54,7 +54,7 @@ Requires: facter >= 1.5 %if "%{ruby_version}" == "1.8" Requires: ruby >= 1.8.5 %endif -%{!?_without_augeas:Requires: ruby-augeas} +%{!?_without_augeas:Requires: ruby(augeas)} Requires(pre): shadow-utils Requires(post): chkconfig @@ -279,6 +279,7 @@ rm -rf %{buildroot} - Move rpmlint fixes to %%prep, add a few additional fixes - Bump minimum ruby version to 1.8.5 now that EL-4 is all but dead - Update install locations for Fedora-17 / Ruby-1.9 +- Use ruby($lib) for augeas and shadow requirements * Thu Jan 05 2012 Todd Zullinger - 2.6.13-2 - Revert to minimal patch for augeas >= 0.10 (bz#771097)