diff --git a/.cvsignore b/.cvsignore
index e32683e..e709d03 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-audacity-src-1.2.4b.tar.gz
+audacity-src-1.2.5.tar.gz
diff --git a/audacity-1.2.2-aboutdialog.patch b/audacity-1.2.2-aboutdialog.patch
index f07f125..c82400b 100644
--- a/audacity-1.2.2-aboutdialog.patch
+++ b/audacity-1.2.2-aboutdialog.patch
@@ -1,15 +1,21 @@
-diff -Nur audacity-src-1.2.2-orig/src/AboutDialog.cpp audacity-src-1.2.2/src/AboutDialog.cpp
---- audacity-src-1.2.2-orig/src/AboutDialog.cpp 2004-08-26 05:27:33.000000000 +0200
-+++ audacity-src-1.2.2/src/AboutDialog.cpp 2004-05-03 19:14:36.000000000 +0200
-@@ -129,11 +125,9 @@
+--- audacity-src-1.2.5/src/AboutDialog.cpp.about 2006-11-03 22:05:02.000000000 +0100
++++ audacity-src-1.2.5/src/AboutDialog.cpp 2006-11-03 22:06:22.000000000 +0100
+@@ -129,18 +129,9 @@
translatorCredits += _("translator_credits");
translatorCredits += "";
}
- wxString localeStr = wxLocale::GetSystemEncodingName();
+-
+- #if defined(__WXGTK__) && defined(wxUSE_UNICODE) && !wxCHECK_VERSION(2, 5, 0)
+- // HTML Charsets are broken in wxGTK 2.4.x with unicode turned on
+- wxString metaTag = "";
+- #else
+- wxString metaTag = "";
+- #endif
wxString creditStr =
""
-- ""
+- "" + metaTag + ""
""
""
""
diff --git a/audacity.spec b/audacity.spec
index 151e4f8..fce0da4 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -1,21 +1,29 @@
-Name: audacity
-Version: 1.2.4
-Release: 0.2.b%{?dist}
-Summary: A multitrack audio editor
-
-Group: Applications/Multimedia
-License: GPL
-URL: http://audacity.sourceforge.net
-Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.4b.tar.gz
-Source1: audacity.png
-Patch1: audacity-1.2.2-aboutdialog.patch
-Patch2: audacity-1.2.3-gcc41.patch
-Patch3: audacity-1.2.4b-missing-pango.patch
+Name: audacity
+Version: 1.2.5
+Release: 1%{?dist}
+Summary: A multitrack audio editor
+
+Group: Applications/Multimedia
+License: GPL
+URL: http://audacity.sourceforge.net
+Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.5.tar.gz
+Source1: audacity.png
+Patch1: audacity-1.2.2-aboutdialog.patch
+Patch2: audacity-1.2.3-gcc41.patch
+Patch3: audacity-1.2.4b-missing-pango.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libogg-devel, libvorbis-devel, zlib-devel, perl
-BuildRequires: gettext, zip, flac-devel, ladspa-devel
-BuildRequires: libsamplerate-devel, libsndfile-devel
-BuildRequires: libid3tag-devel, desktop-file-utils
+BuildRequires: libogg-devel
+BuildRequires: libvorbis-devel
+BuildRequires: zlib-devel
+BuildRequires: perl
+BuildRequires: gettext
+BuildRequires: zip
+BuildRequires: flac-devel
+BuildRequires: ladspa-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libid3tag-devel
+BuildRequires: desktop-file-utils
%{?_with_mp3:BuildRequires: libmad-devel}
%{?_with_gtk2:BuildRequires: compat-wxGTK2-devel}
%{!?_with_gtk2:BuildRequires: compat-wxGTK-devel}
@@ -39,9 +47,9 @@ and the audio I/O currently uses OSS under Linux. Audacity runs on
Linux/*BSD, MacOS, and Windows.
%prep
-%setup -q -n %{name}-src-%{version}b
+%setup -q -n %{name}-src-%{version}
%patch1 -p1 -b .aboutdialog
-%patch2 -p1 -b .gcc4
+#%patch2 -p1 -b .gcc4
%{?_with_gtk2: %patch3 -p1 -b .missing-pango }
cp -a src/Languages.cpp src/Languages.cpp.orig
iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
@@ -111,6 +119,9 @@ rm -rf ${RPM_BUILD_ROOT}
%doc %{_datadir}/doc/*
%changelog
+* Fri Nov 3 2006 Gerard Milmeister - 1.2.5-1
+- new version 1.2.5
+
* Mon Aug 28 2006 Gerard Milmeister - 1.2.4-0.2.b
- Rebuild for FE6
diff --git a/sources b/sources
index e1b76c7..f1a6690 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz
+7558373bee9fd4e7195901b9c0a747f1 audacity-src-1.2.5.tar.gz