From 58d5612d0a77c789d1fce3869b65d991548fcf08cf1481583ed7c725200949a2 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 17 Jan 2011 17:18:05 +0000 Subject: [PATCH] Accepting request 58500 from home:sbrabec:branches:X11:wxWidgets OBS-URL: https://build.opensuse.org/request/show/58500 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=46 --- audacity.changes | 6 ++++++ audacity.spec | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/audacity.changes b/audacity.changes index 0f704fe..39f7cd5 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 28 16:29:51 CET 2010 - sbrabec@suse.cz + +- Compile with wxWidgets-wxcontainer, it does not compile with STL + variant. + ------------------------------------------------------------------- Mon Oct 4 14:27:46 UTC 2010 - reddwarf@opensuse.org diff --git a/audacity.spec b/audacity.spec index 8ed0e87..a68fad2 100644 --- a/audacity.spec +++ b/audacity.spec @@ -35,7 +35,11 @@ BuildRequires: libvorbis-devel BuildRequires: soundtouch-devel BuildRequires: taglib-devel BuildRequires: update-desktop-files +%if %suse_version > 1130 +BuildRequires: wxWidgets-wxcontainer-devel +%else BuildRequires: wxGTK-devel +%endif #vamp-plugin-sdk-devel is available since openSUSE 11.2 %if %suse_version > 1110 BuildRequires: vamp-plugin-sdk-devel @@ -69,6 +73,10 @@ Patch14: %{name}-ffmpeg_match_ext.patch Patch15: %{name}-no_exact_ffmpeg_version.patch Patch16: %{name}-implicit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %suse_version > 1130 +%define _use_internal_dependency_generator 0 +%define __find_requires %wx_requires +%endif %description Audacity is a program that manipulates digital audio wave forms. In