[bcfg2: 13/16] BuildRequires: buildsys-macros for el5 and earlier
John Morris
zultron at fedoraproject.org
Sat Nov 23 20:59:33 UTC 2013
commit 3c794afa2fad5e7f07950aeb1c8c8572081f0f48
Author: John Morris <john at zultron.com>
Date: Wed Aug 7 11:27:57 2013 -0500
BuildRequires: buildsys-macros for el5 and earlier
Comments clarified
bcfg2.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/bcfg2.spec b/bcfg2.spec
index 10dc90c..a29d833 100644
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@ -35,10 +35,14 @@ BuildRequires: python-devel
BuildRequires: python-lxml
BuildRequires: python-daemon
BuildRequires: python-inotify
-%if 0%{?rhel} && 0%{?rhel} < 6
+# if the %%rhel macro is missing, assume el5 or earlier
+%if ( 0%{!?rhel:1} && 0%{!?fedora:1} ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
+# require the %%rhel macro
+BuildRequires: buildsys-macros
+# before python 2.6, the ssl module was separate
BuildRequires: python-ssl
+# EL5 lacks python-mock, so unit tests are disabled
%else # rhel > 5
-# EL5 lacks python-mock, so test suite is disabled
BuildRequires: python-sqlalchemy
BuildRequires: python-nose
BuildRequires: mock
More information about the scm-commits
mailing list