[bcfg2] EL7: Re-add deps and re-enable %%check script; bz #1058427

[John Morris]

commit 79aecb59ace8573a65f8063ff06472833624faa1
Author: John Morris <john at zultron.com>
Date:   Thu Feb 27 01:57:23 2014 -0600

    EL7:  Re-add deps and re-enable %%check script; bz #1058427
    
    Dependent BR: packages now in repos for EL7; enable unit tests

 bcfg2.spec |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/bcfg2.spec b/bcfg2.spec
index 74ed66f..a1fe001 100644
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@ -30,7 +30,7 @@
 
 Name:             bcfg2
 Version:          1.3.3
-Release:          4%{?_pre_rc}%{?dist}
+Release:          5%{?_pre_rc}%{?dist}
 Summary:          A configuration management system
 
 %if 0%{?suse_version}
@@ -89,12 +89,9 @@ BuildRequires:    Django
 BuildRequires:    python-genshi
 BuildRequires:    python-cheetah
 BuildRequires:    libselinux-python
-%if 0%{?rhel} != 7
-# FIXME:  Not yet present in EPEL7; for %%check
 BuildRequires:    pylibacl
 BuildRequires:    python-pep8
 BuildRequires:    pylint
-%endif
 %if %{build_cherry_py}
 BuildRequires:    python-cherrypy >= 3
 %endif
@@ -543,8 +540,6 @@ rm -rf %{buildroot}
 
 %if 0%{?rhel} != 5
 # EL5 lacks python-mock, so test suite is disabled
-%if 0%{?rhel} != 7
-# FIXME:  EL7 has some missing EPEL deps, so test suite is disabled
 %check
 # Downloads not allowed in koji; fix .xsd urls to point to local files
 sed -i "s at schema_url = .*\$@schema_url = 'file://`pwd`/`basename %{SOURCE1}`'@" \
@@ -553,7 +548,6 @@ sed "s at http://www.w3.org/2001/xml.xsd at file://$(pwd)/schemas/xml.xsd@" \
     %{SOURCE1} > `basename %{SOURCE1}`
 %{__python} setup.py test
 %endif
-%endif
 
 
 %post
@@ -793,6 +787,9 @@ sed "s at http://www.w3.org/2001/xml.xsd at file://$(pwd)/schemas/xml.xsd@" \
 
 
 %changelog
+* Wed Feb 26 2014 John Morris <john at zultron.com> - 1.3.3-5
+- EL7:  Re-add deps and re-enable %%check script; bz #1058427
+
 * Sat Feb  1 2014 John Morris <john at zultron.com> - 1.3.3-4
 - Disable bcfg2-web package on EL5; bz #1058427
 - Disable %%check on EL7; missing EPEL deps