diff --git a/audacity-1.3.2-expat2.patch b/audacity-1.3.2-expat2.patch new file mode 100644 index 0000000..dd860a8 --- /dev/null +++ b/audacity-1.3.2-expat2.patch @@ -0,0 +1,15 @@ +diff -Nur audacity-src-1.3.2-beta-orig/src/xml/XMLFileReader.cpp audacity-src-1.3.2-beta/src/xml/XMLFileReader.cpp +--- audacity-src-1.3.2-beta-orig/src/xml/XMLFileReader.cpp 2006-10-29 01:05:26.000000000 +0200 ++++ audacity-src-1.3.2-beta/src/xml/XMLFileReader.cpp 2007-08-28 12:11:08.000000000 +0200 +@@ -61,9 +61,9 @@ + size_t len = fread(buffer, 1, bufferSize, theXMLFile.fp()); + done = (len < bufferSize); + if (!XML_Parse(mParser, buffer, len, done)) { +- mErrorStr.Printf(_("Error: %hs at line %d"), ++ mErrorStr.Printf(_("Error: %hs at line %lu"), + XML_ErrorString(XML_GetErrorCode(mParser)), +- XML_GetCurrentLineNumber(mParser)); ++ (long unsigned int)XML_GetCurrentLineNumber(mParser)); + theXMLFile.Close(); + return false; + } diff --git a/audacity.spec b/audacity.spec index db6754b..d329c26 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -16,6 +16,7 @@ Patch3: audacity-1.3.2-exportmp3.patch Patch4: audacity-1.3.2-destdir.patch Patch5: audacity-1.3.2-resample.patch Patch6: audacity-1.3.2-FLAC.patch +Patch7: audacity-1.3.2-expat2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -57,6 +58,7 @@ Linux/*BSD, MacOS, and Windows. %patch4 -p1 -b .destdir %patch5 -p1 -b .resample %patch6 -p1 -b .FLAC +%patch7 -p1 -b .expat2 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0". for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp @@ -141,6 +143,9 @@ umask 022 %changelog +* Tue Aug 28 2007 Michael Schwendt - 1.3.2-16 +- rebuilt for new expat (#195888) + * Tue Aug 21 2007 Michael Schwendt - 1.3.2-15 - rebuild per request on fedora-devel-list - clarify licence (GPLv2)