[tortoisehg/f21] tortoisehg 3.2.1

[Mads Kiilerich]

commit cd1e22958969b2e34bbae89fca16ce7764d7fb58
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Sun Dec 14 20:34:16 2014 +0100

    tortoisehg 3.2.1

 .gitignore      |    1 +
 sources         |    2 +-
 tortoisehg.spec |   11 +++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 086d992..8b8f073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ tortoisehg-1.1.2.tar.gz
 /tortoisehg-3.0.tar.gz
 /tortoisehg-3.1.tar.gz
 /tortoisehg-3.1.1.tar.gz
+/tortoisehg-3.2.1.tar.gz
diff --git a/sources b/sources
index 40e2d09..0c1fa30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d7afb4ebf3b48aa3395693189daa603  tortoisehg-3.1.1.tar.gz
+6fe5edc038038832be9dc14c1a6037a0  tortoisehg-3.2.1.tar.gz
diff --git a/tortoisehg.spec b/tortoisehg.spec
index 361b599..cb83417 100644
--- a/tortoisehg.spec
+++ b/tortoisehg.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           tortoisehg
-Version:        3.1.1
+Version:        3.2.1
 Release:        1%{?dist}
 Summary:        Mercurial GUI command line tool thg
 Group:          Development/Tools
@@ -11,7 +11,7 @@ URL:            http://tortoisehg.bitbucket.org/
 Source0:        http://bitbucket.org/tortoisehg/targz/downloads/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  python-devel, gettext, python-sphinx, PyQt4-devel, desktop-file-utils
-Requires:       python-iniparse, mercurial < 3.1
+Requires:       python-iniparse, mercurial < 3.3
 # gconf needed at util/shlib.py for browse_url(url).
 Requires:       gnome-python2-gconf
 Requires:       PyQt4 >= 4.6, qscintilla-python, python-pygments
@@ -43,8 +43,8 @@ icon_path    = "%{_datadir}/pixmaps/tortoisehg/icons"
 nofork       = True
 EOT
 
-# hack: accept a higher Mercurial version
-#sed -i -e 's, + 1, + 2,g' -e 's,== nextver,<= nextver,g' tortoisehg/util/hgversion.py
+# hack: accept different Mercurial versions
+sed -i 's,^\(testedwith =\).*,\1 "3.0 3.1 3.2",g' tortoisehg/util/hgversion.py
 
 %build
 %{__python} setup.py build
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/nautilus-python/extensions/nautilus-thg.py*
 
 %changelog
+* Sun Dec 14 2014 Mads Kiilerich <mads at kiilerich.com> - 3.2.1-1
+- tortoisehg 3.2.1
+
 * Sun Sep 07 2014 Mads Kiilerich <mads at kiilerich.com> - 3.1.1-1
 - tortoisehg 3.1.1