Hello community, here is the log from the commit of package spyder for openSUSE:Factory checked in at 2013-04-24 09:48:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spyder (Old) and /work/SRC/openSUSE:Factory/.spyder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spyder", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/spyder/spyder.changes 2013-03-07 07:34:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.spyder.new/spyder.changes 2013-04-24 09:48:43.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 22 21:48:07 UTC 2013 - hrvoje.sen...@gmail.com + +- Added version_check.patch, fixes detection of pyqt version + +------------------------------------------------------------------- New: ---- version_check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spyder.spec ++++++ --- /var/tmp/diff_new_pack.AMVwvs/_old 2013-04-24 09:48:47.000000000 +0200 +++ /var/tmp/diff_new_pack.AMVwvs/_new 2013-04-24 09:48:47.000000000 +0200 @@ -25,6 +25,8 @@ License: MIT Group: Development/Languages/Python Source: http://%{modname}.googlecode.com/files/%{name}-%{version}.zip +# PATCH-FIX-UPSTREAM version_check.patch -- Fixes detection of pyqt version +Patch0: version_check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: IPython BuildRequires: fdupes @@ -89,6 +91,7 @@ %lang_package %prep %setup -q +%patch0 -p1 # add icon line to the .desktop file sed -i '9 i Icon=spyder' scripts/spyder.desktop ++++++ version_check.patch ++++++ diff -urNB spyder-2.1.13.orig/spyderlib/requirements.py spyder-2.1.13/spyderlib/requirements.py --- spyder-2.1.13.orig/spyderlib/requirements.py 2013-01-04 20:09:16.000000000 +0100 +++ spyder-2.1.13/spyderlib/requirements.py 2013-04-22 23:45:41.138802817 +0200 @@ -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 @@ 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." -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
