From e388babf5199d7928ea16dcda1cfaa047eeb83053a58aea9667cbdff8cc5e54f Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 18 Jan 2011 11:08:13 +0000 Subject: [PATCH] Accepting request 58647 from devel:languages:python Accepted submit request 58647 from user coolo OBS-URL: https://build.opensuse.org/request/show/58647 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-matplotlib?expand=0&rev=5 --- python-matplotlib.changes | 5 +++++ python-matplotlib.spec | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/python-matplotlib.changes b/python-matplotlib.changes index 273f77b..189f2e8 100644 --- a/python-matplotlib.changes +++ b/python-matplotlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 29 15:03:06 CET 2010 - sbrabec@suse.cz + +- Compile with wxWidgets (STL variant). + ------------------------------------------------------------------- Sat Dec 11 21:51:21 UTC 2010 - coolo@novell.com diff --git a/python-matplotlib.spec b/python-matplotlib.spec index d7ef569..fceebe0 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -37,8 +37,13 @@ Requires: python-numpy >= 1.2.1 Requires: python-configobj python-dateutil python-tz BuildRequires: python-numpy-devel >= 1.2.1 BuildRequires: gcc-c++ tcl tk -BuildRequires: freetype2-devel gtk2-devel libpng-devel tcl-devel tk-devel wxGTK-devel -BuildRequires: fltk-devel python-gtk python-tk python-wxGTK +BuildRequires: freetype2-devel gtk2-devel libpng-devel tcl-devel tk-devel +BuildRequires: fltk-devel python-gtk python-tk +%if %suse_version > 1130 +BuildRequires: wxWidgets-devel python-wxWidgets +%else +BuildRequires: wxGTK-devel python-wxGTK +%endif BuildRequires: python-gtk-devel %if 0%{?suse_version} >= 1120 BuildRequires: python-qt4 @@ -50,6 +55,10 @@ BuildRequires: libgnome-devel %else BuildRequires: gnome-libs-devel %endif +%if %suse_version > 1130 +%define _use_internal_dependency_generator 0 +%define __find_requires %wx_requires +%endif ## These packages are required to prevent that matplotlib installs it's ## own versions of the packages from the lib directory