[python-fedora/el5] Fix conditional around django package and conditionalize Django BuildRequire

Toshio くらとみ toshio at fedoraproject.org
Wed Sep 4 17:09:01 UTC 2013


commit 35841a4f4e3265c8690fbd9130f2071126342362
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Sep 4 10:08:29 2013 -0700

    Fix conditional around django package and conditionalize Django
    BuildRequire

 python-fedora.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/python-fedora.spec b/python-fedora.spec
index 8d82e26..30efd43 100644
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@ -28,9 +28,12 @@ BuildRequires:  TurboGears2
 BuildRequires:  python-nose
 BuildRequires:  python-kitchen
 BuildRequires:  python-bunch
+BuildRequires:  python-pycurl
 # Needed for tests and for the way we build docs
-BuildRequires: TurboGears python-repoze-who-friendlyform Django
-BuildRequires: python-pycurl
+BuildRequires: TurboGears python-repoze-who-friendlyform
+%if 0%{?fedora} || %0%{?rhel} >= 6
+BuildRequires: Django
+%endif
 
 Requires:       python-simplejson
 Requires:       python-bunch
@@ -86,7 +89,7 @@ logging in to TurboGears2 services based on account information lp build
 CSRF-protected login forms, and miscellaneous other helper functions for
 TurboGears2 applications.
 
-%if 0%{?fedora} && 0%{?rhel} >= 5
+%if 0%{?fedora} || 0%{?rhel} >= 6
 # Django has been removed from epel5 as there's no secure upstream version that
 # runs on py2.4
 %package django


More information about the scm-commits mailing list