rpms/amarok/FC-5 amarok-1.4.5-CVE-2006-6979.patch, 1.1, 1.2 amarok.spec, 1.68, 1.69

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	amarok-1.4.5-CVE-2006-6979.patch amarok.spec 
Log Message:
fix patch (provided by upstream)

amarok-1.4.5-CVE-2006-6979.patch:

Index: amarok-1.4.5-CVE-2006-6979.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok-1.4.5-CVE-2006-6979.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.4.5-CVE-2006-6979.patch	14 Feb 2007 19:13:19 -0000	1.1
+++ amarok-1.4.5-CVE-2006-6979.patch	15 Feb 2007 06:21:23 -0000	1.2
@@ -1,13 +1,28 @@
-Index: src/magnatunebrowser/magnatunealbumdownloader.cpp
+Index: amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
 ===================================================================
---- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp	(revision 633106)
-+++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp	(working copy)
-@@ -89,7 +89,7 @@
+--- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp	(revision 633659)
++++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp	(revision 633677)
+@@ -89,19 +89,19 @@
  
      //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection.
  
 -    QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &";
-+    QString unzipString = KProcess::quote( "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &" );
++    QString unzipString = "unzip "+ KProcess::quote( m_tempDir.name() + m_currentAlbumFileName) + " -d " +KProcess::quote( m_currentAlbumUnpackLocation ) + " &";
  
      debug() << "unpacking: " << unzipString << endl;
  
+     system( unzipString.ascii() );
+ 
+-  
+ 
++
+     if (m_currentAlbumId != -1 ) {
+ 
+-        //now I really want to add the album cover to the same folder where I just unzipped the album... The 
++        //now I really want to add the album cover to the same folder where I just unzipped the album... The
+         //only way of getting the actual location where the album was unpacked is using the artist and album names
+-   
++
+         MagnatuneAlbum album = MagnatuneDatabaseHandler::instance()->getAlbumById( m_currentAlbumId );
+         MagnatuneArtist artist = MagnatuneDatabaseHandler::instance()->getArtistById( album.getArtistId() );
+ 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- amarok.spec	14 Feb 2007 22:09:50 -0000	1.68
+++ amarok.spec	15 Feb 2007 06:21:23 -0000	1.69
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.5
-Release:    2%{?dist}.1
+Release:    3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -237,8 +237,8 @@
 
 
 %changelog
-* Wed Feb 14 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.5-2.1
-- libgod is not new enough in FC5
+* Thu Feb 15 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.5-3
+- fix patch (provided by upstream)
 
 * Wed Feb 14 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.5-2
 - add patch to fix CVE-2006-6979 (bug 228138)