rpms/audacity/FC-1 audacity-1.2.2-aboutdialog.patch, NONE, 1.1 audacity.spec, 1.2, 1.3 sources, 1.2, 1.3

Wed Nov 24 22:53:14 UTC 2004

Changeset from: mschwendt

Update of /cvs/extras/rpms/audacity/FC-1
In directory cvs.fedora.redhat.com:/tmp/cvs-serv13053

Modified Files:
	audacity.spec sources 
Added Files:
	audacity-1.2.2-aboutdialog.patch 
Log Message:
Sync with fedora.us FC1 update.

audacity-1.2.2-aboutdialog.patch:

--- NEW FILE audacity-1.2.2-aboutdialog.patch ---
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 @@
       translatorCredits += _("translator_credits");
       translatorCredits += "</center>";
    }
-   wxString localeStr = wxLocale::GetSystemEncodingName();
 
    wxString creditStr = 
       "<html>"
-      "<head><META http-equiv=\"Content-Type\" content=\"text/html; charset=" + localeStr + "\"></head>"
       "<body bgcolor=\"#ffffff\">"
       "<font size=1>"
       "<center>"


Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-1/audacity.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audacity.spec	8 Nov 2004 04:04:16 -0000	1.2
+++ audacity.spec	24 Nov 2004 22:53:12 -0000	1.3
@@ -1,7 +1,5 @@
-%define ver 1.2.1
-
 Name:		audacity
-Version:	%{ver}
+Version:	1.2.2
 Release:	0.fdr.1.1
 Epoch:		0
 Summary: 	A multitrack audio editor
@@ -9,8 +7,9 @@
 Group: 		Applications/Multimedia
 License:	GPL
 URL: 		http://audacity.sourceforge.net
-Source: 	http://aleron.dl.sourceforge.net/sourceforge/audacity/audacity-src-1.2.1.tar.bz2
+Source: 	http://aleron.dl.sourceforge.net/sourceforge/audacity/audacity-src-1.2.2.tar.gz
 Source1:	audacity.png
+Patch1:		audacity-1.2.2-aboutdialog.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
@@ -30,6 +29,7 @@
 
 %prep
 %setup -q -n %{name}-src-%{version}
+%patch1 -p1 -b .aboutdialog
 cp -a src/Languages.cpp src/Languages.cpp.orig
 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
@@ -83,6 +83,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Sat Oct 30 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.2.2-0.fdr.1
+- Update to 1.2.2, patch aboutdialog to be readable with wxGTK.
+
 * Mon May 10 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:1.2.1-0.fdr.1
 - New Version 1.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:04:07 -0000	1.2
+++ sources	24 Nov 2004 22:53:12 -0000	1.3
@@ -1 +1 @@
-8914538a3edb6f88e2f70fb2fec3790f  audacity-src-1.2.1.tar.bz2
+68d60659ad936792f6d7d746a40a7179  audacity-src-1.2.2.tar.gz


