[tortoisehg] tortoisehg-2.3.2

[Mads Kiilerich]

commit 14f0e0381a85fd82ac2869c839c83ee882ad3231
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Wed Apr 25 03:13:34 2012 +0200

    tortoisehg-2.3.2
    
    - accept Mercurial 2.2

 .gitignore      |    1 +
 sources         |    2 +-
 tortoisehg.spec |   11 +++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f77f92..876edc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ tortoisehg-1.1.2.tar.gz
 /tortoisehg-2.2.2.tar.gz
 /tortoisehg-2.3.tar.gz
 /tortoisehg-2.3.1.tar.gz
+/tortoisehg-2.3.2.tar.gz
diff --git a/sources b/sources
index 718b72c..b809113 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2950272af9949761a5bf6386c1b506e4  tortoisehg-2.3.1.tar.gz
+66b230f460ea5903ce79ae25fd7cc761  tortoisehg-2.3.2.tar.gz
diff --git a/tortoisehg.spec b/tortoisehg.spec
index 7e528b7..f51719a 100644
--- a/tortoisehg.spec
+++ b/tortoisehg.spec
@@ -3,7 +3,7 @@
 %define debug_package %{nil}
 
 Name:           tortoisehg
-Version:        2.3.1
+Version:        2.3.2
 Release:        1%{?dist}
 Summary:        Mercurial GUI command line tool thg
 Group:          Development/Tools
@@ -15,7 +15,7 @@ Source0:        http://bitbucket.org/tortoisehg/targz/downloads/%{name}-%{versio
 # subpackage has to be arch-specific:
 # BuildArch:    noarch
 BuildRequires:  python-devel, gettext, python-sphinx, PyQt4-devel, desktop-file-utils
-Requires:       python-iniparse, mercurial >= 2.1, mercurial < 2.2
+Requires:       python-iniparse, mercurial >= 2.1, mercurial <= 2.2
 # gconf needed at util/shlib.py for browse_url(url).
 Requires:       gnome-python2-gconf
 Requires:       PyQt4 >= 4.6, qscintilla-python, python-pygments
@@ -50,6 +50,9 @@ icon_path    = "%{_datadir}/pixmaps/tortoisehg/icons"
 nofork       = True
 EOT
 
+# hack: accept Mercurial 2.2 too
+sed -i -e 's, + 1, + 2,g' -e 's,== nextver,<= nextver,g' tortoisehg/util/hgversion.py
+
 %build
 %{__python} setup.py build
 
@@ -90,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nautilus/extensions-2.0/python/nautilus-thg.py*
 
 %changelog
+* Tue Apr 24 2012 Mads Kiilerich <mads at kiilerich.com> - 2.3.2-1
+- tortoisehg-2.3.2
+- accept Mercurial 2.2
+
 * Sat Mar 10 2012 Mads Kiilerich <mads at kiilerich.com> - 2.3.1-1
 - tortoisehg-2.3.1
 - remove Mercurial 2.1 hack