[tortoisehg] actually apply hack to relax version check so it works with mercurial-2.1

Mads Kiilerich kiilerix at fedoraproject.org
Wed Jan 25 19:42:24 UTC 2012


commit 9b943e7eb7fc3d37f9d5e52ba27f8395845def1b
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Wed Jan 25 20:42:15 2012 +0100

    actually apply hack to relax version check so it works with mercurial-2.1

 tortoisehg.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/tortoisehg.spec b/tortoisehg.spec
index a5675f0..42391c5 100644
--- a/tortoisehg.spec
+++ b/tortoisehg.spec
@@ -4,7 +4,7 @@
 
 Name:           tortoisehg
 Version:        2.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mercurial GUI command line tool thg
 Group:          Development/Tools
 License:        GPLv2
@@ -50,6 +50,9 @@ icon_path    = "%{_datadir}/pixmaps/tortoisehg/icons"
 nofork       = True
 EOT
 
+# hack: accept Mercurial 2.1 too
+sed -i 's, + 1, + 2,g' tortoisehg/util/hgversion.py
+
 %build
 %{__python} setup.py build
 
@@ -90,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nautilus/extensions-2.0/python/nautilus-thg.py*
 
 %changelog
+* Wed Jan 25 2012 Mads Kiilerich <mads at kiilerich.com> - 2.2.2-3
+- actually apply hack to relax version check so it works with mercurial-2.1
+
 * Wed Jan 25 2012 Mads Kiilerich <mads at kiilerich.com> - 2.2.2-2
 - bump Mercurial version requirement to accept mercurial-2.1-1.rc1.
   tortoisehg-2.2.2 happens to work with the next version of Mercurial anyway.


More information about the scm-commits mailing list