rpms/audacity/devel audacity.spec, 1.35.2.5.2.14, 1.35.2.5.2.15 audacity-1.3.4-expat2.patch, 1.1.2.1, NONE

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
      Tag: audacity-1_3_4-test
	audacity.spec 
Removed Files:
      Tag: audacity-1_3_4-test
	audacity-1.3.4-expat2.patch 
Log Message:
expat2 patch merged upstream


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.35.2.5.2.14
retrieving revision 1.35.2.5.2.15
diff -u -r1.35.2.5.2.14 -r1.35.2.5.2.15
--- audacity.spec	9 May 2008 21:31:13 -0000	1.35.2.5.2.14
+++ audacity.spec	9 May 2008 21:43:14 -0000	1.35.2.5.2.15
@@ -22,7 +22,6 @@
 Source1: audacity.png
 Source2: audacity.desktop
 
-Patch2: audacity-1.3.4-expat2.patch
 Patch3: audacity-1.3.4-libdir.patch
 Patch4: audacity-1.3.4-gcc43.patch
 Patch5: audacity-1.3.4-libmp3lame-default.patch
@@ -90,7 +89,6 @@
 ###
 
 cd %{tartopdir}
-%patch2 -p1 -b .expat2
 
 # Substitute hardcoded library paths.
 %patch3 -p1
@@ -253,6 +251,7 @@
 %changelog
 * Fri May  9 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.2.beta
 - update to 1.3.5-beta
+- expat2 patch merged upstream
 
 * Mon May  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.1.rc3.20080505cvs
 - update to 1.3.5-rc3 cvs snapshot


--- audacity-1.3.4-expat2.patch DELETED ---