[python-django-evolution/el6: 2/2] Merge branch 'f20' into el6

[Stephen Gallagher]

commit 9699c7df8ab537cd75745e41a77f441977fa3b31
Merge: aeb4557 0135cbe
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Jun 12 10:23:12 2014 -0400

    Merge branch 'f20' into el6
    
    Conflicts:
    	python-django-evolution.spec

 0001-Conditionalize-ez_setup.patch                 |   42 ++++++++++++++++++
 0002-Support-parallel-installed-Django.patch       |   46 ++++++++++++++++++++
 ...1-Disable-ez_setup-when-installing-by-RPM.patch |   13 ------
 python-django-evolution.spec                       |   18 +++++---
 4 files changed, 99 insertions(+), 20 deletions(-)
---
diff --cc python-django-evolution.spec
index d13b778,dbd96c0..8c621d1
--- a/python-django-evolution.spec
+++ b/python-django-evolution.spec
@@@ -16,8 -16,10 +16,10 @@@ BuildRequires:  python-nos
  BuildRequires:  python-coverage
  BuildRequires:  pyflakes
  BuildRequires:  python-sqlite
- BuildRequires:  Django >= 1.1.1
- Requires:       Django >= 1.1.1
+ 
+ # django_evolution 0.6.9 only supports up to Django 1.4
 -BuildRequires:  python-django14
 -Requires:       python-django14
++BuildRequires:  Django14
++Requires:       Django14
  
  Provides:       django-evolution = %{version}-%{release}
  Obsoletes:      django-evolution < 0.6.7-4