From f127291835baf15867ff60cea5e0c2fbe3f8414f Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Thu, 16 Jan 2014 10:46:19 +0100 Subject: [PATCH] Remove F18 conditionals since it's EOL now --- puppet.spec | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/puppet.spec b/puppet.spec index c961559..978ce43 100644 --- a/puppet.spec +++ b/puppet.spec @@ -11,13 +11,7 @@ %global puppet_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') %endif -# F-17 also ships with systemd; package/use systemd files in this case -%if 0%{?fedora} > 18 %global _with_systemd 1 -%else -%global _with_systemd 0 -%endif - %global confdir ext/redhat Name: puppet @@ -43,12 +37,8 @@ BuildArch: noarch %if 0%{?rhel} && 0%{?rhel} <= 6 Requires: ruby(abi) = 1.8 %else -%if 0%{?fedora} <= 18 -Requires: ruby(abi) = 1.9.1 -%else Requires: ruby(release) %endif -%endif Requires: ruby(shadow) # Prevents jruby from being pulled in by dependencies (BZ #985208)