rpms/audacity/devel audacity-1.3.4-compile.patch, NONE, 1.1.2.1 .cvsignore, 1.8.2.1, 1.8.2.1.2.1 audacity.spec, 1.35.2.5, 1.35.2.5.2.1 sources, 1.10.2.1, 1.10.2.1.2.1 audacity-1.3.2-destdir.patch, 1.1, NONE audacity-1.3.3-FLAC.patch, 1.1.2.1, NONE
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Mon Nov 19 16:03:40 UTC 2007
Author: mschwendt
Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31979
Modified Files:
Tag: audacity-1_3_4-test
.cvsignore audacity.spec sources
Added Files:
Tag: audacity-1_3_4-test
audacity-1.3.4-compile.patch
Removed Files:
Tag: audacity-1_3_4-test
audacity-1.3.2-destdir.patch audacity-1.3.3-FLAC.patch
Log Message:
* Mon Nov 19 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.4-0.2
- update to 1.3.4-beta release
- patch ImportMP3.cpp to make it build
audacity-1.3.4-compile.patch:
--- NEW FILE audacity-1.3.4-compile.patch ---
diff -Nur audacity-src-1.3.4-beta-orig/src/import/ImportMP3.cpp audacity-src-1.3.4-beta/src/import/ImportMP3.cpp
--- audacity-src-1.3.4-beta-orig/src/import/ImportMP3.cpp 2007-11-13 23:01:43.000000000 +0100
+++ audacity-src-1.3.4-beta/src/import/ImportMP3.cpp 2007-11-19 14:01:18.000000000 +0100
@@ -35,6 +35,8 @@
#include "../Internat.h"
#include "../Tags.h"
+#define DESC _("MP3 files")
+
static const wxChar *exts[] =
{
wxT("mp3"),
@@ -49,7 +51,7 @@
UnusableImportPluginList *unusableImportPluginList)
{
UnusableImportPlugin* mp3IsUnsupported =
- new UnusableImportPlugin(DESC, wxArrayString(wxSIZEOF(exts), exts));
+ new UnusableImportPlugin(DESC, wxArrayString(WXSIZEOF(exts), exts));
unusableImportPluginList->Append(mp3IsUnsupported);
}
@@ -75,8 +77,6 @@
#include "../WaveTrack.h"
-#define DESC _("MP3 files")
-
#define INPUT_BUFFER_SIZE 65535
#define PROGRESS_SCALING_FACTOR 100000
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/.cvsignore,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.1.2.1
diff -u -r1.8.2.1 -r1.8.2.1.2.1
--- .cvsignore 27 May 2007 08:07:10 -0000 1.8.2.1
+++ .cvsignore 19 Nov 2007 16:03:03 -0000 1.8.2.1.2.1
@@ -1 +1 @@
-audacity-src-1.3.3.tar.gz
+audacity-src-1.3.4.tar.bz2
Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.35.2.5
retrieving revision 1.35.2.5.2.1
diff -u -r1.35.2.5 -r1.35.2.5.2.1
--- audacity.spec 27 May 2007 09:07:52 -0000 1.35.2.5
+++ audacity.spec 19 Nov 2007 16:03:03 -0000 1.35.2.5.2.1
@@ -1,24 +1,26 @@
Name: audacity
-Version: 1.3.3
-Release: 0.1.beta%{?dist}
+Version: 1.3.4
+Release: 0.2.beta%{?dist}
Summary: A multitrack audio editor
Group: Applications/Multimedia
-License: GPL
+License: GPLv2
URL: http://audacity.sourceforge.net
-Source: http://dl.sf.net/sourceforge/audacity/audacity-src-%{version}.tar.gz
+Source: http://dl.sf.net/sourceforge/audacity/audacity-src-%{version}.tar.bz2
Source1: audacity.png
# iconv on src/Languages.cpp (ISO Latin-1 to UTF-8)
Patch1: audacity-1.3.2-languages.patch
-Patch4: audacity-1.3.2-destdir.patch
-Patch6: audacity-1.3.3-FLAC.patch
+Patch2: audacity-1.3.4-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
BuildRequires: flac-devel
BuildRequires: gettext
-BuildRequires: jack-audio-connection-kit-devel
+#BuildRequires: jack-audio-connection-kit-devel
+# PA v19 init starts jackd
+BuildConflicts: jack-audio-connection-kit-devel
+
BuildRequires: ladspa-devel
BuildRequires: libid3tag-devel
BuildRequires: libogg-devel
@@ -50,8 +52,7 @@
%prep
%setup -q -n %{name}-src-%{version}-beta
%patch1 -p1 -b .languages
-%patch4 -p1 -b .destdir
-%patch6 -p1 -b .FLAC
+%patch2 -p1 -b .compile
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in locale/*.po src/export/ExportMP3.cpp
@@ -115,13 +116,13 @@
%post
umask 022
%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-%{_bindir}/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
umask 022
%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-%{_bindir}/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%files -f %{name}.lang
@@ -136,6 +137,13 @@
%changelog
+* Mon Nov 19 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.4-0.2
+- update to 1.3.4-beta release
+- patch ImportMP3.cpp to make it build
+
+* Thu Nov 8 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.4-0.1.20071108cvs
+- update to cvs (pre 1.3.4-beta)
+
* Mon May 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.3-0.1.beta
- update to 1.3.3 beta
- now build with wxGTK2 2.8.x
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/sources,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.1.2.1
diff -u -r1.10.2.1 -r1.10.2.1.2.1
--- sources 27 May 2007 08:07:10 -0000 1.10.2.1
+++ sources 19 Nov 2007 16:03:03 -0000 1.10.2.1.2.1
@@ -1 +1 @@
-72a9e3239f3b5af63030a1e1b07e40e7 audacity-src-1.3.3.tar.gz
+6c4ada9085f916b5ae1675eaa4754442 audacity-src-1.3.4.tar.bz2
--- audacity-1.3.2-destdir.patch DELETED ---
--- audacity-1.3.3-FLAC.patch DELETED ---
More information about the fedora-extras-commits
mailing list