[ReviewBoard/epel7: 2/2] Merge branch 'f21' into epel7

[Stephen Gallagher]

commit b1ad383ea7050b2a89f257521f7ed92b54a4ef5c
Merge: 7137916 f848a76
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Feb 17 09:28:34 2015 -0500

    Merge branch 'f21' into epel7

 .gitignore                                         |    1 +
 0001-Create-new-sites-in-a-default-path.patch      |  134 --------------------
 0002-Rename-platform.py-to-rb_platform.py.patch    |   41 ------
 FED01-Soften-dependencies.patch                    |   87 ++++++++++++-
 ...ge-default-paths-to-match-Fedora-policies.patch |    4 +-
 ReviewBoard.spec                                   |   12 +-
 sources                                            |    2 +-
 7 files changed, 90 insertions(+), 191 deletions(-)
---
diff --cc ReviewBoard.spec
index 4014c5e,06de0dc..a3835a3
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@@ -74,12 -74,11 +74,10 @@@ Requires:       python-whoos
  BuildRequires:  python-django-haystack
  Requires:       python-django-haystack
  
 -# Requires httpd 2.4.7-3 or later in order to support systemd snippets
 -# Note: this differs on F20 and F21
 -Requires:       httpd >= 2.4.7-5
 +# Note: this differs on F20, F21 and RHEL 7
 +Requires:       httpd
  
  # Upstream patches awaiting the next release
- Patch0001: 0001-Create-new-sites-in-a-default-path.patch
- Patch0002: 0002-Rename-platform.py-to-rb_platform.py.patch
  
  # Fedora-specific patches