[ReviewBoard] Fix conflict with Django 1.4

[Stephen Gallagher]

commit 1c1d31b99a0902c06a4d06fe107c1778cfc37a37
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Apr 25 19:54:39 2012 -0400

    Fix conflict with Django 1.4
    
    - Guarantee rebuild of .egg-info

 ReviewBoard.spec |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/ReviewBoard.spec b/ReviewBoard.spec
index 4264df8..2405e59 100644
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@ -2,7 +2,7 @@
 
 Name:           ReviewBoard
 Version:        1.6.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Web-based code review tool
 Group:          Applications/Internet
 License:        MIT
@@ -12,9 +12,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
+
+%if 0%{?fedora} > 17
+Requires:       python-django >= 1.3.1
+# ReviewBoard 1.6 is not yet compatible with Django 1.4
+Conflicts:      python-django >= 1.4
+%else
 Requires:       Django >= 1.3.1
 # ReviewBoard 1.6 is not yet compatible with Django 1.4
 Conflicts:      Django >= 1.4
+%endif
+
 Requires:       python-djblets >= 0.6.17
 Requires:       python-imaging
 Requires:       httpd
@@ -58,13 +66,16 @@ of the stress and time out of the code review process.
 %patch1002 -p1
 %patch1003 -p1
 
+# Remove packaged egg-info so it's regenerated by setup.py
+rm -rf %{python_sitelib}/ReviewBoard*.egg-info
+
+
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# --skip-build causes bad stuff in siteconfig.py as of 0.8.4
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 # These scripts have a shebang and are meaningful to run; make them executable:
@@ -100,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/webtests/*.py*
 
 %changelog
+* Wed Apr 25 2012 Stephen Gallagher <sgallagh at redhat.com> - 1.6.6-2
+- Fix conflict with Django 1.4
+- Guarantee rebuild of .egg-info
+
 * Wed Apr 25 2012 Stephen Gallagher <sgallagh at redhat.com> - 1.6.6-1
 - New upstream release 1.6.6
 - New Features: