[ReviewBoard/f19: 2/3] Merge branch 'master' into el6

[Stephen Gallagher]

commit be3bad2f49e2548c4d3c5485fcbc118a366ee64c
Merge: 180bdf1 5433611
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Apr 9 15:41:13 2014 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	ReviewBoard.spec

 .gitignore                                         |    1 +
 ...t-building-with-parallel-installed-Django.patch |   31 ++++++++++++++++++++
 FED03-Change-default-cache-file-path.patch         |   28 ++++-------------
 FED04-Soften-requires.txt.patch                    |   10 +++---
 ReviewBoard.spec                                   |   10 +++++-
 sources                                            |    2 +-
 6 files changed, 53 insertions(+), 29 deletions(-)
---
diff --cc ReviewBoard.spec
index d770422,1270025..35a2e7d
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@@ -70,7 -69,11 +70,8 @@@ Requires:       Django1
  BuildRequires:  python-django-evolution >= 0.6.9
  Requires:       python-django-evolution >= 0.6.9
  
 -# Requires httpd 2.4.7-5 or later in order to support systemd snippets
 -Requires:       httpd >= 2.4.7-5
 -
  # Upstream patches awaiting the next release
+ Patch0001: 0001-Support-building-with-parallel-installed-Django.patch
  
  # Fedora-specific patches
  
@@@ -146,15 -149,14 +148,19 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/ReviewBoard*.egg-info/
  %{python_sitelib}/webtests/*.py*
  
 +%post
 +if [ $1 -eq 2 ] ; then
 +    # When upgrading the package, run the upgrade script
 +    # automatically to ensure that existing sites are
 +    # up-to-date
 +    %{_bindir}/rb-site upgrade --all-sites || :
 +fi
 +
  %changelog
+ * Wed Apr 09 2014 Stephen Gallagher <sgallagh at redhat.com> 1.7.23-1
+ - New upstream security release 1.7.23
+ - http://www.reviewboard.org/docs/releasenotes/reviewboard/1.7.23
+ 
 -* Mon Mar 03 2014 Stephen Gallagher <sgallagh at redhat.com> 1.7.22-2
 -- Add BuildRequires: systemd for the %%{_unitdir}} macro
 -
  * Mon Mar 03 2014 Stephen Gallagher <sgallagh at redhat.com> 1.7.22-1
  - New upstream security release 1.7.22
  - http://www.reviewboard.org/docs/releasenotes/reviewboard/1.7.22/