rpms/audacity/devel .cvsignore, 1.3, 1.4 audacity-1.2.2-aboutdialog.patch, 1.1, 1.2 audacity.spec, 1.14, 1.15 sources, 1.5, 1.6

Fri Nov 3 21:43:03 UTC 2006

Author: gemi

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

Modified Files:
	.cvsignore audacity-1.2.2-aboutdialog.patch audacity.spec 
	sources 
Log Message:
new version 1.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	20 Mar 2006 00:58:52 -0000	1.3
+++ .cvsignore	3 Nov 2006 21:42:32 -0000	1.4
@@ -1 +1 @@
-audacity-src-1.2.4b.tar.gz
+audacity-src-1.2.5.tar.gz

audacity-1.2.2-aboutdialog.patch:

Index: audacity-1.2.2-aboutdialog.patch
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity-1.2.2-aboutdialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacity-1.2.2-aboutdialog.patch	25 Nov 2004 00:01:49 -0000	1.1
+++ audacity-1.2.2-aboutdialog.patch	3 Nov 2006 21:42:32 -0000	1.2
@@ -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 += "</center>";
     }
 -   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 = "<META http-equiv=\"Content-Type\" content=\"text/html; charset=" + localeStr + "\">";
+-   #endif
  
     wxString creditStr = 
        "<html>"
--      "<head><META http-equiv=\"Content-Type\" content=\"text/html; charset=" + localeStr + "\"></head>"
+-      "<head>" + metaTag + "</head>"
        "<body bgcolor=\"#ffffff\">"
        "<font size=1>"
        "<center>"


Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- audacity.spec	27 Aug 2006 23:23:54 -0000	1.14
+++ audacity.spec	3 Nov 2006 21:42:32 -0000	1.15
@@ -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 @@
 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 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Fri Nov  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.2.5-1
+- new version 1.2.5
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.2.4-0.2.b
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Mar 2006 00:58:52 -0000	1.5
+++ sources	3 Nov 2006 21:42:32 -0000	1.6
@@ -1 +1 @@
-37df5b6119302f7ab77ca16d25311756  audacity-src-1.2.4b.tar.gz
+7558373bee9fd4e7195901b9c0a747f1  audacity-src-1.2.5.tar.gz


