[tortoisehg/f17] support for PyQt-4.10 #920749

[Mads Kiilerich]

commit c37a219cb2c80dab4b94db0c347baa863c0286ac
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Wed Mar 13 01:16:40 2013 +0100

    support for PyQt-4.10 #920749

 thg-e571f9b3eadc2e2706bd350dab33d3bee5bf2315.diff |   25 +++++++++++++++++++++
 tortoisehg.spec                                   |    7 +++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/thg-e571f9b3eadc2e2706bd350dab33d3bee5bf2315.diff b/thg-e571f9b3eadc2e2706bd350dab33d3bee5bf2315.diff
new file mode 100644
index 0000000..079afe1
--- /dev/null
+++ b/thg-e571f9b3eadc2e2706bd350dab33d3bee5bf2315.diff
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User Steve Borho <steve at borho.org>
+# Date 1362690570 21600
+# Branch stable
+# Node ID e571f9b3eadc2e2706bd350dab33d3bee5bf2315
+# Parent  6fbbe3d1974c267e5a30e4d9d1efc54a24fd1f35
+qt: use int comparison for Qt and PyQt version check (fixes #2467)
+
+backported to 2.4.3
+
+diff -r 6fbbe3d1974c267e5a30e4d9d1efc54a24fd1f35 -r e571f9b3eadc2e2706bd350dab33d3bee5bf2315 tortoisehg/hgqt/qtlib.py
+--- a/tortoisehg/hgqt/qtlib.py	Mon Mar 04 17:00:24 2013 -0600
++++ b/tortoisehg/hgqt/qtlib.py	Thu Mar 07 15:09:30 2013 -0600
+@@ -25,9 +25,8 @@
+ from PyQt4.QtCore import *
+ from PyQt4.QtGui import *
+ 
+-if PYQT_VERSION_STR.split('.') < ['4', '7'] or \
+-   QT_VERSION_STR.split('.') < ['4', '6']:
+-    sys.stderr.write('TortoiseHg requires Qt 4.6 and PyQt 4.7\n')
++if PYQT_VERSION < 0x40600 or QT_VERSION < 0x40600:
++    sys.stderr.write('TortoiseHg requires Qt 4.6 and PyQt 4.6\n')
+     sys.stderr.write('You have Qt %s and PyQt %s\n' %
+                      (QT_VERSION_STR, PYQT_VERSION_STR))
+     sys.exit()
diff --git a/tortoisehg.spec b/tortoisehg.spec
index f95efdd..85cbb25 100644
--- a/tortoisehg.spec
+++ b/tortoisehg.spec
@@ -4,13 +4,14 @@
 
 Name:           tortoisehg
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mercurial GUI command line tool thg
 Group:          Development/Tools
 License:        GPLv2
 # - few files are however under the more permissive GPLv2+
 URL:            http://tortoisehg.bitbucket.org/
 Source0:        http://bitbucket.org/tortoisehg/targz/downloads/%{name}-%{version}.tar.gz
+Patch1:         thg-e571f9b3eadc2e2706bd350dab33d3bee5bf2315.diff
 # This package _is_ noarch, but that isn't possible because the nautilus
 # subpackage has to be arch-specific:
 # BuildArch:    noarch
@@ -38,6 +39,7 @@ Note that the nautilus extension has been deprecated upstream.
 
 %prep
 %setup -q
+%patch1 -p1
 
 # Patch nautilus-python extension directory
 %{__sed} -i "s,lib/nautilus/extensions-2.0/python,share/nautilus-python/extensions,g" setup.py
@@ -93,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/nautilus-python/extensions/nautilus-thg.py*
 
 %changelog
+* Tue Mar 12 2013 Mads Kiilerich <mads at kiilerich.com> - 2.4.3-2
+- support for PyQt-4.10 #920749
+
 * Tue Aug 21 2012 Mads Kiilerich <mads at kiilerich.com> - 2.4.3-1
 - tortoisehg-2.4.3