From 992abbc5b970c890b6e07d885814838d4d2c664b Mon Sep 17 00:00:00 2001 From: Radek Novacek Date: Mar 11 2013 07:44:35 +0000 Subject: Fix checking PyQt4 version - Resolves: #919921 --- diff --git a/spyder-2.1.13-fix-PyQt-version-check.patch b/spyder-2.1.13-fix-PyQt-version-check.patch new file mode 100644 index 0000000..6f8c4f4 --- /dev/null +++ b/spyder-2.1.13-fix-PyQt-version-check.patch @@ -0,0 +1,35 @@ +diff -up spyder-2.1.13/spyderlib/requirements.py.fix-pyqt-version-check spyder-2.1.13/spyderlib/requirements.py +--- spyder-2.1.13/spyderlib/requirements.py.fix-pyqt-version-check 2013-03-11 08:39:34.983742989 +0100 ++++ spyder-2.1.13/spyderlib/requirements.py 2013-03-11 08:41:58.377527964 +0100 +@@ -9,13 +9,7 @@ + import sys + import os + import os.path as osp +- +-def check_version(actual_str, required_str): +- """Return True if actual_str version fit required_str requirement""" +- actual = actual_str.split('.') +- required = required_str.split('.') +- return actual[0] < required[0] or \ +- (actual[0] == required[0] and actual[1] < required[1]) ++from distutils.version import LooseVersion + + def show_warning(message): + """Show warning using Tkinter if available""" +@@ -43,12 +37,12 @@ def check_qt(): + qt_infos = dict(pyqt=("PyQt4", "4.4"), pyside=("PySide", "1.0")) + try: + from spyderlib import qt +- package_name, required_str = qt_infos[qt.API] +- actual_str = qt.__version__ +- if check_version(actual_str, required_str): ++ package_name, required_ver = qt_infos[qt.API] ++ actual_ver = qt.__version__ ++ if LooseVersion(actual_ver) < LooseVersion(required_ver): + show_warning("Please check Spyder installation requirements:\n" + "%s %s+ is required (found v%s)." +- % (package_name, required_str, actual_str)) ++ % (package_name, required_ver, actual_ver)) + except ImportError: + show_warning("Please check Spyder installation requirements:\n" + "%s %s+ (or %s %s+) is required." diff --git a/spyder.spec b/spyder.spec index b0c48ec..4ef6813 100644 --- a/spyder.spec +++ b/spyder.spec @@ -5,7 +5,7 @@ Name: spyder Version: 2.1.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Scientific Python Development Environment Source0: http://spyderlib.googlecode.com/files/%{name}-%{version}.zip Source1: %{name}.desktop @@ -20,6 +20,9 @@ Requires: python-rope python-sphinx Requires: hicolor-icon-theme BuildArch: noarch +# Fix checking PyQt4 version, couldn't find PyQt4 >= 4.10 +Patch0: spyder-2.1.13-fix-PyQt-version-check.patch + %description Spyder is a Python development environment with advanced editing, interactive testing, debugging and introspection features. It is especially recommended @@ -32,6 +35,7 @@ widgets. %prep %setup -q +%patch0 -p1 -b .fix-pyqt-version-check rm -rf PKG-INFO @@ -80,6 +84,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Mar 11 2013 Radek Novacek 2.1.13-3 +- Fix checking PyQt4 version +- Resolves: #919921 + * Fri Feb 15 2013 Fedora Release Engineering - 2.1.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild