[python-djblets] New upstream releae 0.6.22

[Stephen Gallagher]

commit dce702b22bb786da423f0092debdb0c10d1d8661
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jul 31 08:52:54 2012 -0400

    New upstream releae 0.6.22
    
    - Fixes to support Review Board 1.6.11
    - djblets.datagrid:
    -     Improved performance of the datagrids
    - djblets.util:
    -     The ifuserorperm template tag now accepts both IDs and User
          objects, allowing comparisons to be made without fetching the
          User
    -     Fixed a bug with ifuserorperm and non-int IDs
    -     User and AnonymousUser are no longer imported globally in
          the djblets_utils templatetags. This fixes some breakages in
          apps that imported this file to get access to filters, but weren't
          running in a Django settings environment

 .gitignore                                         |    1 +
 0001-Conditionalize-ez_setup.patch                 |   41 ++++++++++++++++++++
 ...1-Disable-ez_setup-when-installing-by-RPM.patch |   26 ------------
 python-djblets.spec                                |   23 +++++++++--
 sources                                            |    2 +-
 5 files changed, 62 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52947b6..cc9958e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ Djblets-0.6.3.tar.gz
 /Djblets-0.6.17.tar.gz
 /Djblets-0.6.18.tar.gz
 /Djblets-0.6.19.tar.gz
+/Djblets-0.6.22.tar.gz
diff --git a/0001-Conditionalize-ez_setup.patch b/0001-Conditionalize-ez_setup.patch
new file mode 100644
index 0000000..a8e2f23
--- /dev/null
+++ b/0001-Conditionalize-ez_setup.patch
@@ -0,0 +1,41 @@
+From daeda5d9847a31128ee997aee5de2f8b179c6d2e Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh at redhat.com>
+Date: Tue, 31 Jul 2012 08:17:07 -0400
+Subject: [PATCH] Conditionalize ez_setup
+
+This makes life simpler for packagers, since most packaging tools
+will ensure that the appropriate packages are available on the
+system. Additionally, most packaging tools prefer not to rely on
+network access (since it can mean that identical rebuilds cannot
+be performed).
+
+Built locally with 'python setup.py build' and also by applying this patch and
+performing an RPM build in a network-free environment.
+---
+ setup.py |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index e0334d97e6d330b342b9912c5cccfada02c5952a..64d6a7ddff85cdb4d5961ce1537228b5c21e417c 100755
+--- a/setup.py
++++ b/setup.py
+@@ -24,10 +24,12 @@
+ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+-from ez_setup import use_setuptools
+-use_setuptools()
+-
+-from setuptools import setup, find_packages
++try:
++    from setuptools import setup, find_packages
++except ImportError:
++    from ez_setup import use_setuptools
++    use_setuptools()
++    from setuptools import setup, find_packages
+ 
+ from setuptools.command.test import test
+ 
+-- 
+1.7.10.4
+
diff --git a/python-djblets.spec b/python-djblets.spec
index 0029002..16ee32f 100644
--- a/python-djblets.spec
+++ b/python-djblets.spec
@@ -4,8 +4,8 @@
 %endif
 
 Name:           python-djblets
-Version:        0.6.19
-Release:        2%{?dist}
+Version:        0.6.22
+Release:        1%{?dist}
 Summary:        A collection of useful classes and functions for Django
 Group:          Applications/Internet
 # Djblets is MIT licensed:
@@ -28,14 +28,14 @@ Requires:       Django >= 1.1.1
 %endif
 Requires:       python-imaging
 
-Patch1000: FED01-Disable-ez_setup-when-installing-by-RPM.patch
+Patch0001: 0001-Conditionalize-ez_setup.patch
 
 %description
 A collection of useful classes and functions for Django
 
 %prep
 %setup -q -n Djblets-%{version}
-%patch1000 -p1
+%patch0001 -p1
 
 # Remove packaged egg-info so it's regenerated by setup.py
 rm -Rf Djblets*.egg-info
@@ -65,6 +65,21 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/djblets/
 
 %changelog
+* Tue Jul 31 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.6.22-1
+- New upstream releae 0.6.22
+- Fixes to support Review Board 1.6.11
+- djblets.datagrid:
+-     Improved performance of the datagrids
+- djblets.util:
+-     The ifuserorperm template tag now accepts both IDs and User
+      objects, allowing comparisons to be made without fetching the
+      User
+-     Fixed a bug with ifuserorperm and non-int IDs
+-     User and AnonymousUser are no longer imported globally in
+      the djblets_utils templatetags. This fixes some breakages in
+      apps that imported this file to get access to filters, but weren't
+      running in a Django settings environment
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 606a6d4..6ab55e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f96de8012fc8e6e0881d7929387847b8  Djblets-0.6.19.tar.gz
+cf9d6df682889d6e79b945b8624da116  Djblets-0.6.22.tar.gz