[ReviewBoard] Fix serious upgrade bug from 1.6beta1 Resolves: rhbz#598463 - rb-site suggests that I use an unsafe

[Stephen Gallagher]

commit 5531313729d3b1b4f74f4c0a05f8b79a3f742d7a
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Fri Jun 17 15:59:50 2011 -0400

    Fix serious upgrade bug from 1.6beta1
    Resolves: rhbz#598463 - rb-site suggests that I use an unsafe temporary
    directory

 .gitignore                                 |    1 +
 FED03-Change-default-cache-file-path.patch |   40 ++++++++++++++++++++++++++++
 ReviewBoard.spec                           |   13 +++++++--
 sources                                    |    2 +-
 4 files changed, 52 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8792d86..d194249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ ReviewBoard-1.5rc1.tar.gz
 /ReviewBoard-1.5.4.tar.gz
 /ReviewBoard-1.6beta1.tar.gz
 /ReviewBoard-1.6beta2.tar.gz
+/ReviewBoard-1.6beta2.1.tar.gz
diff --git a/FED03-Change-default-cache-file-path.patch b/FED03-Change-default-cache-file-path.patch
new file mode 100644
index 0000000..a4a96a0
--- /dev/null
+++ b/FED03-Change-default-cache-file-path.patch
@@ -0,0 +1,40 @@
+From 06ff349cab6d6597f7f38e9b5fbe7f6cc0b45457 Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh at redhat.com>
+Date: Fri, 17 Jun 2011 15:50:05 -0400
+Subject: [PATCH 3/3] Change default cache file path
+
+FHS requirement
+---
+ contrib/conf/settings_local.py.tmpl |    2 +-
+ reviewboard/cmdline/rbsite.py       |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/conf/settings_local.py.tmpl b/contrib/conf/settings_local.py.tmpl
+index a2773ffb9ba4ad0b44d1d0868e15db5a692ce1b4..3db98dc5d7d82065d36dc0c15f53058e383099f4 100644
+--- a/contrib/conf/settings_local.py.tmpl
++++ b/contrib/conf/settings_local.py.tmpl
+@@ -14,7 +14,7 @@ SECRET_KEY = '***********************************************'
+ # In most Installations, memcached is the best option. Development
+ # installations can get away with a file-based or local memory cache.
+ #
+-# CACHE_BACKEND = 'file:///tmp/reviewboard_cache?max_entries=5000'
++# CACHE_BACKEND = 'file:///var/cache/reviewboard/cache?max_entries=5000'
+ # CACHE_BACKEND = 'memcached://localhost:11211//'
+ CACHE_BACKEND = 'locmem:///'
+ 
+diff --git a/reviewboard/cmdline/rbsite.py b/reviewboard/cmdline/rbsite.py
+index 0d204a6ca1876746be78f5e35b39e37d8e906d2c..2fd1e7e8fec56cd62e2522f34fcbe28a59d04154 100755
+--- a/reviewboard/cmdline/rbsite.py
++++ b/reviewboard/cmdline/rbsite.py
+@@ -1386,7 +1386,7 @@ class InstallCommand(Command):
+                        is_visible_func=lambda: site.cache_type == "file")
+ 
+         ui.prompt_input(page, "Cache Directory",
+-                        site.cache_info or "/tmp/reviewboard_cache",
++                        site.cache_info or "/var/cache/reviewboard/cache",
+                         normalize_func=lambda value: "file://" + value,
+                         save_obj=site, save_var="cache_info")
+ 
+-- 
+1.7.5.4
+
diff --git a/ReviewBoard.spec b/ReviewBoard.spec
index 15da913..486cf79 100644
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@ -2,12 +2,12 @@
 
 Name:           ReviewBoard
 Version:        1.6
-Release:        2%{?dist}.beta2
+Release:        3%{?dist}.beta2.1
 Summary:        Web-based code review tool
 Group:          Applications/Internet
 License:        MIT
 URL:            http://www.review-board.org
-Source0:        http://downloads.review-board.org/releases/%{name}/1.5/%{name}-%{version}beta2.tar.gz
+Source0:        http://downloads.review-board.org/releases/%{name}/1.5/%{name}-%{version}beta2.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -31,6 +31,7 @@ Requires:       python-dateutil
 
 Patch1001: FED01-Disable-ez_setup-when-installing-by-RPM.patch
 Patch1002: FED02-Notify-WSGI-users-that-config-changes-are-needed.patch
+Patch1003: FED03-Change-default-cache-file-path.patch
 
 %description
 Review Board is a powerful web-based code review tool that offers
@@ -39,9 +40,10 @@ projects to large companies and offers a variety of tools to take much
 of the stress and time out of the code review process.
 
 %prep
-%setup -q -n %{name}-%{version}beta2
+%setup -q -n %{name}-%{version}beta2.1
 %patch1001 -p1
 %patch1002 -p1
+%patch1003 -p1
 
 %build
 %{__python} setup.py build
@@ -85,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/webtests/*.py*
 
 %changelog
+* Fri Jun 17 2011 Stepgen Gallagher <sgallagh at redhat.com> - 1.6-3.beta2.1
+- Fix serious upgrade bug from 1.6beta1
+- Resolves: rhbz#598463 - rb-site suggests that I use an unsafe temporary
+-                         directory
+
 * Mon May 09 2011 Stephen Gallagher <sgallagh at redhat.com> - 1.6-2.beta2
 - This release contains all bug fixes and features found in Review Board
 - version 1.5.5.
diff --git a/sources b/sources
index 9b31901..15457b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47522e8adadf3a9ccad17220c3b4f76c  ReviewBoard-1.6beta2.tar.gz
+7fda7b720f212b4cc30c03764bff072e  ReviewBoard-1.6beta2.1.tar.gz