[bcfg2/el6] Requires: python-django for EPEL7

John Morris zultron at fedoraproject.org
Mon Feb 3 18:13:35 UTC 2014


commit 109126f2c0e7d4189fecb63c571e4873f990b683
Author: John Morris <john at zultron.com>
Date:   Mon Feb 3 12:10:10 2014 -0600

    Requires: python-django for EPEL7
    
    Pick up missed change from upstream

 bcfg2.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/bcfg2.spec b/bcfg2.spec
index 0a4d64c..20cae29 100644
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@ -304,8 +304,13 @@ Requires:         python-django >= 1.2
 Requires:         python-django-south >= 0.7
 %else
 Group:            System Tools
+# EPEL uses the properly-named python-django starting with EPEL7
+%if 0%{?rhel} && 0%{?rhel} > 6
+Requires:         python-django
+%else
 Requires:         Django >= 1.2
 Requires:         Django-south >= 0.7
+%endif
 Requires:         bcfg2-server
 %endif
 Requires:         httpd


More information about the scm-commits mailing list