rpms/audacity/devel audacity-1.3.6-lang-default.patch, NONE, 1.1.2.1 audacity.spec, 1.58.2.3, 1.58.2.4

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10719

Modified Files:
      Tag: audacity-1_3_6-test
	audacity.spec 
Added Files:
      Tag: audacity-1_3_6-test
	audacity-1.3.6-lang-default.patch 
Log Message:
* Sun Oct 26 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.6-0.2.beta
- auto-choose default language (fixes request in #468622).


audacity-1.3.6-lang-default.patch:

--- NEW FILE audacity-1.3.6-lang-default.patch ---
diff -Nur audacity-src-1.3.6-orig/src/AudacityApp.cpp audacity-src-1.3.6/src/AudacityApp.cpp
--- audacity-src-1.3.6-orig/src/AudacityApp.cpp	2008-10-25 14:14:27.000000000 +0200
+++ audacity-src-1.3.6/src/AudacityApp.cpp	2008-10-26 21:29:11.000000000 +0100
@@ -63,7 +63,7 @@
 #include "effects/LoadEffects.h"
 #include "FreqWindow.h"
 #include "Internat.h"
-#include "LangChoice.h"
+#include "Languages.h"
 #include "Prefs.h"
 #include "Project.h"
 #include "Screenshot.h"
@@ -753,7 +753,7 @@
 
    // Pop up a dialog the first time the program is run
    if (lang == wxT(""))
-      lang = ChooseLanguage(NULL);
+      lang = GetSystemLanguageCode();
 
 #ifdef NOT_RQD
 //TIDY-ME: (CleanSpeech) Language prompt??


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.58.2.3
retrieving revision 1.58.2.4
diff -u -r1.58.2.3 -r1.58.2.4
--- audacity.spec	25 Oct 2008 22:10:40 -0000	1.58.2.3
+++ audacity.spec	26 Oct 2008 21:22:16 -0000	1.58.2.4
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.6
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -17,6 +17,7 @@
 
 Patch1: audacity-1.3.4-libmp3lame-default.patch
 Patch2: audacity-1.3.6-libdir.patch
+Patch3: audacity-1.3.6-lang-default.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -66,6 +67,8 @@
     sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
 done
 
+%patch3 -p1 -b .lang-default
+
 
 %build
 %configure \
@@ -129,6 +132,9 @@
 
 
 %changelog
+* Sun Oct 26 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.6-0.2.beta
+- auto-choose default language (fixes request in #468622).
+
 * Fri Oct 24 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.6-0.1.beta
 - prepare upgrade with Leland's 1.3.6-beta tarball
 - fr.po patch merged upstream