[pootle] - Update to 2.1.5 - Fix regression causing update from templates to fail for GNU Style proje

[dwayne]

commit 8ff057d165b707925a1321c6ba38b314f196a41d
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Tue Jan 18 22:01:14 2011 +0200

    - Update to 2.1.5
       - Fix regression causing update from templates to fail for GNU Style
         projects with subdirectories.
       - Fix regression in handling obsolete units while committing to version
         control (reported by Mozilla).
       - Clean stale file locks left in cases of external kills which running
         expensive commands.
       - Fix security bug where project names would leak to users without view
         access on the server via news summary on front page or profile edit form.
       - Fix a bug that prevented Project level permissions from overriding very
         restrictive server wide permissions.
    - Refresh Fedora settings patch

 .gitignore                                         |    1 +
 ...s.patch => pootle-2.1.5-1-fedora-settings.patch |    8 ++++----
 pootle.spec                                        |   18 ++++++++++++++++--
 sources                                            |    2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 347930e..2968529 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ Pootle-2.0.3.tar.bz2
 /Pootle-2.1.2.tar.bz2
 /Pootle-2.1.3.tar.bz2
 /Pootle-2.1.4.tar.bz2
+/Pootle-2.1.5.tar.bz2
diff --git a/pootle-2.1.1-1-fedora-settings.patch b/pootle-2.1.5-1-fedora-settings.patch
similarity index 81%
rename from pootle-2.1.1-1-fedora-settings.patch
rename to pootle-2.1.5-1-fedora-settings.patch
index c893752..71eb2d5 100644
--- a/pootle-2.1.1-1-fedora-settings.patch
+++ b/pootle-2.1.5-1-fedora-settings.patch
@@ -1,6 +1,6 @@
-diff -up Pootle-2.1.1/localsettings.py.fedora-settings Pootle-2.1.1/localsettings.py
---- Pootle-2.1.1/localsettings.py.fedora-settings	2010-09-02 22:26:57.000000000 +0200
-+++ Pootle-2.1.1/localsettings.py	2010-09-04 08:22:39.000000000 +0200
+diff -up Pootle-2.1.5/localsettings.py.fedora-settings Pootle-2.1.5/localsettings.py
+--- Pootle-2.1.5/localsettings.py.fedora-settings	2010-12-29 08:59:26.000000000 +0200
++++ Pootle-2.1.5/localsettings.py	2011-01-18 21:55:59.991568215 +0200
 @@ -69,10 +69,10 @@ PARSE_POOL_CULL_FREQUENCY = 4
  # By default we use Django's in memory cache which is only suitable
  # for small deployments. memcached is preferred. For more info, check
@@ -17,7 +17,7 @@ diff -up Pootle-2.1.1/localsettings.py.fedora-settings Pootle-2.1.1/localsetting
 @@ -82,7 +82,7 @@ CACHE_BACKEND = 'db://pootlecache?max_en
  #SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
  
- # Uncomment this if you're using memcached as CACHE_BACKEND and running under Django 1.1
+ # Uncomment this if you're using memcached as CACHE_BACKEND and running under Django >= 1.1
 -#SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
 +SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
  
diff --git a/pootle.spec b/pootle.spec
index 4ebfbfd..de13b74 100644
--- a/pootle.spec
+++ b/pootle.spec
@@ -3,7 +3,7 @@
 %global         fullname Pootle
 
 Name:           pootle
-Version:        2.1.4
+Version:        2.1.5
 Release:        1%{?dist}
 Summary:        Localization and translation management web application
 
@@ -15,7 +15,7 @@ Source1:        pootle.conf
 Source2:        README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         pootle-2.1.1-1-fedora-settings.patch
+Patch0:         pootle-2.1.5-1-fedora-settings.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -129,6 +129,20 @@ fi
 
 
 %changelog
+* Tue Jan 18 2011 Dwayne Bailey <dwayne at translate.org.za> - 2.1.5-1
+- Update to 2.1.5
+   - Fix regression causing update from templates to fail for GNU Style
+     projects with subdirectories.
+   - Fix regression in handling obsolete units while committing to version
+     control (reported by Mozilla).
+   - Clean stale file locks left in cases of external kills which running
+     expensive commands.
+   - Fix security bug where project names would leak to users without view
+     access on the server via news summary on front page or profile edit form.
+   - Fix a bug that prevented Project level permissions from overriding very
+     restrictive server wide permissions.
+- Refresh Fedora settings patch
+
 * Fri Dec 17 2010 Dwayne Bailey <dwayne at translate.org.za> - 2.1.4-1
 - Update to 2.1.4
    - Fix quality checks update on file uploads.
diff --git a/sources b/sources
index 491e3f9..a946034 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8eced82dbc8cab7aa0d81fb4519b739a  Pootle-2.1.4.tar.bz2
+e29ec52e4c198ee4084578b21d177770  Pootle-2.1.5.tar.bz2