rpms/audacity/devel audacity.spec,1.30,1.31

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8952

Modified Files:
	audacity.spec 
Log Message:
build with wxGTK 2.6 compatibility package


Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- audacity.spec	18 Feb 2007 21:10:02 -0000	1.30
+++ audacity.spec	23 Feb 2007 21:37:01 -0000	1.31
@@ -1,12 +1,12 @@
 Name:           audacity
 Version:        1.3.2
-Release:        11.20070106cvs%{?dist}
+Release:        12%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://audacity.sourceforge.net
-Source:         http://dl.sf.net/sourceforge/audacity/audacity-cvs20070106.tar.bz2
+Source:         http://dl.sf.net/sourceforge/audacity/audacity-src-%{version}.tar.gz
 Source1:        audacity.png
 Patch4:         audacity-1.3.2-destdir.patch
 Patch5:         audacity-1.3.2-resample.patch
@@ -24,7 +24,7 @@
 BuildRequires:  libsndfile-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  perl
-BuildRequires:  wxGTK2-devel
+BuildRequires:  compat-wxGTK26-devel
 BuildRequires:  zip
 BuildRequires:  zlib-devel
 %{?_with_mp3:BuildRequires: libmad-devel}
@@ -45,7 +45,7 @@
 Linux/*BSD, MacOS, and Windows.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-src-%{version}-beta
 %patch4 -p1 -b .destdir
 %patch5 -p1 -b .resample
 cp -a src/Languages.cpp src/Languages.cpp.orig
@@ -60,9 +60,12 @@
 perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.*
 %endif
 
+# for wxGTK26-compat
+perl -pi -e 's|wx-config|wx-2.6-config|' configure
+
 
 %build
-%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-expat=system --with-portaudio=v19 --without-portmixer %{?_with_mp3:--with-libmad=system} %{!?_with_mp3:--without-libmad} --without-flac
+%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-expat=system --with-portaudio=v19 --without-portmixer %{?_with_mp3:--with-libmad=system} 
 make
 
 
@@ -124,6 +127,9 @@
 
 
 %changelog
+* Fri Feb 23 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.3.2-12
+- build with wxGTK 2.6 compatibility package
+
 * Sun Feb 18 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.3.2-11.20070106cvs
 - added patch for compiling with libsamplerate