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

[Stephen Gallagher]

commit ae48584e260d46cd2c2318dac7801e86d8ee1669
Merge: c390157 b473d6d
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Apr 22 15:05:54 2013 -0400

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

 .gitignore       |    1 +
 ReviewBoard.spec |   64 ++++++++++++++++++++++++++++++++++++++---------------
 sources          |    2 +-
 3 files changed, 48 insertions(+), 19 deletions(-)
---
diff --cc ReviewBoard.spec
index 58cfc04,aabbedd..a3175b0
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@@ -18,32 -18,17 +18,18 @@@ BuildRequires:  python-mimepars
  BuildRequires:  python-sphinx
  BuildRequires:  python-recaptcha-client
  BuildRequires:  pysvn
 -BuildRequires:  python-pygments >= 1.4
 +BuildRequires:  python-pygments >= 1.1.1
  BuildRequires:  python-nose
  BuildRequires:  pytz
 -BuildRequires:  python-paramiko >= 1.7.6
 +BuildRequires:  python-paramiko
  BuildRequires:  python-dateutil
  BuildRequires:  python-mimeparse
 -BuildRequires:  python-markdown >= 2.2.1
 +BuildRequires:  python-markdown
  BuildRequires:  python-docutils
  BuildRequires:  python-slimit
 +BuildRequires:  nodejs-less
  
- %if 0%{?fedora} > 17
- BuildRequires:  python-django14
- Requires:       python-django >= 1.4.3
- Conflicts:      python-django >= 1.5
- BuildRequires:  python-django-evolution >= 0.6.9
- Requires:       python-django-evolution >= 0.6.9
- %else
- BuildRequires:  Django14
- Requires:       Django >= 1.4.5
- Conflicts:      Django >= 1.5
- BuildRequires:  django-evolution >= 0.6.9
- Requires:       django-evolution >= 0.6.9
- %endif
- 
- Requires:       python-djblets >= 0.7.11
+ Requires:       python-djblets >= 0.7.12
  Requires:       python-imaging
  Requires:       httpd
  Requires:       mod_wsgi
@@@ -75,6 -60,13 +61,13 @@@ Requires:       gi
  Requires:       subversion
  Requires:       mercurial
  
+ # Distro-release-specific
+ # Change this for each branch
 -BuildRequires:  python-django14
 -Requires:       python-django14
++BuildRequires:  Django14
++Requires:       Django14
+ BuildRequires:  python-django-evolution >= 0.6.9
+ Requires:       python-django-evolution >= 0.6.9
+ 
  Patch1003: FED03-Change-default-cache-file-path.patch
  Patch1004: FED04-Compress-JavaScript-with-SlimIt.patch
  Patch1005: FED05-Fix-references-to-cgit-id.patch
@@@ -136,13 -128,49 +129,48 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/webtests/*.py*
  
  %changelog
+ * Mon Apr 22 2013 Stephen Gallagher <sgallagh at redhat.com> - 1.7.7.1-1
+ - New upstream release 1.7.7.1
+ - http://www.reviewboard.org/docs/releasenotes/reviewboard/1.7.7.1/
+ - Bug Fixes:
+     * Fixed a problem with generating config files when creating a new site
+       installations
+ - New upstream release 1.7.7
+ - http://www.reviewboard.org/docs/releasenotes/reviewboard/1.7.7/
+ - New Features:
+     * The configured SSH key can now be deleted
+     * Added support for working against a GitHub OAuth application
+ - Performance Improvements:
+     * Uploading a diff with a parent diff will no longer attempt to process any
+       files in the parent diff that aren't in the main diff
+     * Sped up rendering times for the Dashboard, All Review Requests page, and
+       the user/groups pages
+ - Web API Improvements:
+     * Fixed a breakage with updating comments when the issue_status field
+       wasn't provided
+     * Improved caching logic to not claim a cached payload is valid when the
+       client reports a matching Last Modified timestamp but not a matching
+       ETag
+ - Bug Fixes:
+     * Specifying a port in a SSH URL for a repository will now connect on that
+       port
+     * Fixed broken links to file attachments when using Local Sites
+     * Review request e-mails now show the right ID in the subject for Local
+       Sites
+     * Fixed Python path issues when spawning processes
+     * Fixed a rare breakage when saving repositories
+     * Fixed the cookie path when using site directories
+     * When installing a site, database hosts now accept a port in the format of
+       hostname:port
+     * Fixed visual glitches with some rounded corners in the UI
+ 
 +* Thu Apr 11 2013 Stephen Gallagher <sgallagh at redhat.com> - 1.7.6-4.3
 +- Fixes for building on EPEL 6
 +
  * Wed Apr 10 2013 Stephen Gallagher <sgallagh at redhat.com> - 1.7.6-4
  - Add explicit BuildRequires: python-django14
 -
 -* Wed Apr 10 2013 Stephen Gallagher <sgallagh at redhat.com> - 1.7.6-3
  - Change to explicit requirement on python-django14
  - Resolves: rhbz#950411 - Change requires to python-django14
 -
 -* Thu Mar 21 2013 Stephen Gallagher <sgallagh at redhat.com> - 1.7.6-2
  - Replace references of id2= with id= for cgit
  - Use file blobs rather than plaintext representation with Fedora
    Hosted cgit repositories