[tortoisehg/f18: 2/2] support for PyQt-4.10 #920749

[Mads Kiilerich]

commit dede425852a2c9220200cf43f388ee29b97b451f
Merge: c3af3d7 c37a219
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Wed Mar 13 01:24:24 2013 +0100

    support for PyQt-4.10 #920749

 thg-e571f9b3eadc2e2706bd350dab33d3bee5bf2315.diff |   25 +++++++++++++++++++++
 tortoisehg.spec                                   |    7 +++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --cc tortoisehg.spec
index 3e42072,85cbb25..f878474
--- a/tortoisehg.spec
+++ b/tortoisehg.spec
@@@ -1,17 -1,22 +1,18 @@@
  %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 -# Pure python package
 -%define debug_package %{nil}
  
  Name:           tortoisehg
 -Version:        2.4.3
 +Version:        2.6.2
- 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
 +BuildArch:      noarch
  BuildRequires:  python-devel, gettext, python-sphinx, PyQt4-devel, desktop-file-utils
 -Requires:       python-iniparse, mercurial >= 2.1, mercurial < 2.3
 +Requires:       python-iniparse, mercurial >= 2.3, mercurial < 2.5
  # gconf needed at util/shlib.py for browse_url(url).
  Requires:       gnome-python2-gconf
  Requires:       PyQt4 >= 4.6, qscintilla-python, python-pygments
@@@ -34,7 -39,11 +35,8 @@@ Note that the nautilus extension has be
  
  %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
 -
  cat > tortoisehg/util/config.py << EOT
  bin_path     = "%{_bindir}"
  license_path = "%{_docdir}/%{name}-%{version}/COPYING.txt"
@@@ -86,18 -95,9 +88,21 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/nautilus-python/extensions/nautilus-thg.py*
  
  %changelog
 -* Tue Mar 12 2013 Mads Kiilerich <mads at kiilerich.com> - 2.4.3-2
++* Tue Mar 12 2013 Mads Kiilerich <mads at kiilerich.com> - 2.6.2-2
+ - support for PyQt-4.10 #920749
+ 
 +* Fri Jan 04 2013 Mads Kiilerich <mads at kiilerich.com> - 2.6.2-1
 +- tortoisehg-2.6.2
 +
 +* Mon Nov 19 2012 Mads Kiilerich <mads at kiilerich.com> - 2.6-1
 +- tortoisehg-2.6
 +
 +* Wed Oct 03 2012 Mads Kiilerich <mads at kiilerich.com> - 2.5.1-1
 +- tortoisehg-2.5.1
 +
 +* Thu Sep 06 2012 Mads Kiilerich <mads at kiilerich.com> - 2.5-1
 +- tortoisehg-2.5
 +
  * Tue Aug 21 2012 Mads Kiilerich <mads at kiilerich.com> - 2.4.3-1
  - tortoisehg-2.4.3