rpms/audacity//FC-3 audacity.spec,1.6,1.7

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/audacity//FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13561

Modified Files:
	audacity.spec 
Log Message:
Build gtk2 version by default



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity//FC-3/audacity.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- audacity.spec	5 Apr 2005 20:00:40 -0000	1.6
+++ audacity.spec	6 Apr 2005 22:20:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		audacity
 Version:	1.2.3
-Release:	2
+Release:	3
 Summary: 	A multitrack audio editor
 
 Group: 		Applications/Multimedia
@@ -15,14 +15,14 @@
 BuildRequires:	libsamplerate-devel, libsndfile-devel
 BuildRequires:	libid3tag-devel, desktop-file-utils
 %{?_with_mp3:BuildRequires: libmad-devel}
-%{?_with_gtk2:BuildRequires: wxGTK2-devel}
-%{!?_with_gtk2:BuildRequires: wxGTK-devel}
+%{?_with_gtk1:BuildRequires: wxGTK-devel}
+%{!?_with_gtk1:BuildRequires: wxGTK2-devel}
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
 # Compile options:
 # --with mp3          : enable mp3 support
-# --with gtk2	      : use gtk2 version of wxGTK
+# --with gtk1	      : use GTK+ version of wxGTK, else GTK2 version
 # --with portaudiov19 : enable version 19 of portaudio (disables portmixer)
 
 
@@ -41,7 +41,7 @@
 iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
 do
-   perl -pi -e 's|libmp3lame.so|libmp3lame.so.0|g' $i
+   perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
 done
 
 %build
@@ -98,6 +98,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Thu Apr  7 2005 Gerard Milmeister <gemi at bluewin.ch> - 1.2.3-3
+- Build gtk2 version by default
+
 * Tue Apr  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 1.2.3-2
 - Rebuild to pick a new FLAC dependencies