diff options
| author | John Morris <john@zultron.com> | 2014-02-27 11:29:17 -0600 |
|---|---|---|
| committer | John Morris <john@zultron.com> | 2014-04-06 18:37:33 -0500 |
| commit | 2609e3304a7b4a34cdada81cf25722c52de30a2a (patch) | |
| tree | 066999c9a186ef0c9607f47052d6d948572b2f65 /misc | |
| parent | 01db3dc7d35d659489bfc45a9d9ddba8709184cc (diff) | |
| download | bcfg2-2609e3304a7b4a34cdada81cf25722c52de30a2a.tar.gz bcfg2-2609e3304a7b4a34cdada81cf25722c52de30a2a.tar.bz2 bcfg2-2609e3304a7b4a34cdada81cf25722c52de30a2a.zip | |
misc/bcfg2.spec: reconcile w/Fedora: re-enable unit tests in EL7
EL7 deps needed for unit tests (pylibacl, python-pep8, pylint) now
built for EPEL7.
https://bugzilla.redhat.com/show_bug.cgi?id=1058427
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bcfg2.spec | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index f271427b3..6a4153472 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -85,16 +85,13 @@ BuildRequires: m2crypto BuildRequires: python-django %else BuildRequires: Django -# FIXME: Not yet present in EPEL7; for building docs -BuildRequires: gamin-python -# FIXME: Not yet present in EPEL7; for %%check -BuildRequires: pylibacl -BuildRequires: python-pep8 -BuildRequires: pylint %endif BuildRequires: python-genshi BuildRequires: python-cheetah BuildRequires: libselinux-python +BuildRequires: pylibacl +BuildRequires: python-pep8 +BuildRequires: pylint %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@schema_url = .*\$@schema_url = 'file://`pwd`/`basename %{SOURCE1}`'@" \ @@ -553,7 +548,6 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %{SOURCE1} > `basename %{SOURCE1}` %{__python} setup.py test %endif -%endif %post @@ -793,6 +787,12 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %changelog +* Sun Apr 6 2014 John Morris <john@zultron.com> - 1.3.4-1 +- New upstream release + +* Wed Feb 26 2014 John Morris <john@zultron.com> - 1.3.3-5 +- EL7: Re-add deps and re-enable %%check script; bz #1058427 + * Sat Feb 1 2014 John Morris <john@zultron.com> - 1.3.3-4 - Disable bcfg2-web package on EL5; bz #1058427 - Disable %%check on EL7; missing EPEL deps |