[puppet/epel7] Remove F18 conditionals since it's EOL now
Sam Kottler
skottler at fedoraproject.org
Thu Jan 16 09:46:27 UTC 2014
commit 07d623d64973afa8fb5ef83961aed6fe70ecf906
Author: Sam Kottler <shk at redhat.com>
Date: Thu Jan 16 10:46:19 2014 +0100
Remove F18 conditionals since it's EOL now
puppet.spec | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/puppet.spec b/puppet.spec
index 94eb070..47dbc50 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
@@ -41,12 +35,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)
More information about the scm-commits
mailing list