rpms/audacity/FC-5 .cvsignore, 1.4, 1.5 audacity-1.2.2-aboutdialog.patch, 1.1, 1.2 audacity.spec, 1.14, 1.15 sources, 1.6, 1.7

Fri Nov 3 21:43:02 UTC 2006

Author: gemi

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

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/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- .cvsignore	26 Mar 2006 21:49:32 -0000	1.4
+++ .cvsignore	3 Nov 2006 21:42:31 -0000	1.5
@@ -1 +1 @@
-audacity-src-1.3.0b.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/FC-5/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:31 -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/FC-5/audacity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- audacity.spec	26 Mar 2006 21:49:32 -0000	1.14
+++ audacity.spec	3 Nov 2006 21:42:31 -0000	1.15
@@ -1,44 +1,43 @@
-Name:		audacity
-Version:	1.3.0
-Release:	1.beta.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.3.0b.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
-Patch4:		audacity-1.3.0b-gcc41.patch
-Patch5:		audacity-1.3.0b-lsrver.patch
-Patch6:		audacity-1.3.0b-install.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
-BuildRequires:	libvorbis-devel
-BuildRequires:	zlib-devel
-BuildRequires:	perl
+BuildRequires:  libvorbis-devel
+BuildRequires:  zlib-devel
+BuildRequires:  perl
 BuildRequires:	gettext
-BuildRequires:	zip
-BuildRequires:	flac-devel
-BuildRequires:	ladspa-devel
+BuildRequires:  zip
+BuildRequires:  flac-devel
+BuildRequires:  ladspa-devel
 BuildRequires:	libsamplerate-devel
-BuildRequires:	libsndfile-devel
+BuildRequires:  libsndfile-devel
 BuildRequires:	libid3tag-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	wxGTK-devel >= 2.6.2
+BuildRequires:  desktop-file-utils
 %{?_with_mp3:BuildRequires: libmad-devel}
+%{?_with_gtk2:BuildRequires: compat-wxGTK2-devel}
+%{!?_with_gtk2:BuildRequires: compat-wxGTK-devel}
 # libwx_gtk2-2.4.so: undefined reference to `pango_x_get_context'
-#%{?_with_gtk2: BuildRequires:  pango-devel}
-Requires(post):		desktop-file-utils, shared-mime-info
-Requires(postun):	desktop-file-utils, shared-mime-info
+%{?_with_gtk2: BuildRequires:  pango-devel}
+Requires(post):		desktop-file-utils
+Requires(postun):	desktop-file-utils
 
 # Compile options:
 # --with mp3          : enable mp3 support
 # --with gtk2	      : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version
 # --with portaudiov19 : enable version 19 of portaudio (disables portmixer)
 
+
 %description
 Audacity is a cross-platform multitrack audio editor. It allows you to
 record sounds directly or to import Ogg, WAV, AIFF, AU, IRCAM, or MP3
@@ -47,46 +46,28 @@
 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-beta
-#%patch1 -p1 -b .aboutdialog
+%setup -q -n %{name}-src-%{version}
+%patch1 -p1 -b .aboutdialog
 #%patch2 -p1 -b .gcc4
-#%{?_with_gtk2: %patch3 -p1 -b .missing-pango }
-%patch4 -p1 -b .gcc41
-%patch5 -p1 -b .lsrver
-%patch6 -p1 -b .install
-
-# convert Languages.cpp from latin1 to UTF-8
+%{?_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
-
-# is this still necessary?
 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
 do
    perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
 done
 
-
 %build
 # Push a softlink into PATH so the renamed wx-config inside
 # the compat-wxGTK2-devel package is found and taken.
-#%define mybindir __mybin__
-#mkdir %{mybindir}
-#ln -s $(which wx-2.4-config) %{mybindir}/wx-config
-#export PATH=$(pwd)/%{mybindir}:$PATH
-
-%configure \
-	--with-help \
-	--with-libsndfile=system \
-	--with-libflac=system \
-	--with-ladspa \
-	--with-vorbis=system \
-	--with-id3tag=system \
-	%{?_with_mp3:--with-libmad=system} \
-	%{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer}
-make
+%define mybindir __mybin__
+mkdir %{mybindir}
+ln -s $(which wx-2.4-config) %{mybindir}/wx-config
+export PATH=$(pwd)/%{mybindir}:$PATH
 
+%configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer}
+make
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -105,7 +86,7 @@
 Comment=A multitrack audio editor
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.4
-MimeType=application/ogg;application/x-ogg;audio/x-ogg;audio/x-wav;audio/x-flac;audio/aiff;audio/x-aifc;audio/aiffc;audio/x-aiff;audio/basic;application/x-audacity-project
+MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg
 StartupWMClass=Audacity
 EOF
 
@@ -122,17 +103,12 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
 %post
-/usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1 || :
 /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
 
-
 %postun
-/usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1 || :
 /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -140,13 +116,11 @@
 %{_mandir}/*/*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
-%{_datadir}/mime/packages/*
 %doc %{_datadir}/doc/*
 
-
 %changelog
-* Sun Mar 26 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.3.0-1.beta.1
-- new version 1.3.0beta
+* Fri Nov  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.2.5-1
+- new version 1.2.5
 
 * Fri Mar 17 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-0.1.b
 - Update to 1.2.4b (stable release).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Mar 2006 21:49:32 -0000	1.6
+++ sources	3 Nov 2006 21:42:31 -0000	1.7
@@ -1 +1 @@
-d1c5a3359ad95eab6ca8b375972c1a91  audacity-src-1.3.0b.tar.gz
+7558373bee9fd4e7195901b9c0a747f1  audacity-src-1.2.5.tar.gz


