rpms/audacity/devel audacity-1.3.2-expat2.patch, NONE, 1.1 audacity.spec, 1.37, 1.38

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.2-expat2.patch 
Log Message:
* Tue Aug 28 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.2-16
- rebuilt for new expat (#195888)


audacity-1.3.2-expat2.patch:

--- NEW FILE audacity-1.3.2-expat2.patch ---
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;
       }


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- audacity.spec	21 Aug 2007 16:45:32 -0000	1.37
+++ audacity.spec	28 Aug 2007 10:17:59 -0000	1.38
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Tue Aug 28 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.2-16
+- rebuilt for new expat (#195888)
+
 * Tue Aug 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.2-15
 - rebuild per request on fedora-devel-list
 - clarify licence (GPLv2)