[rpms/amarok] epel10.2: fix patch (provided by upstream)

[rpms/amarok] epel10.2: fix patch (provided by upstream)

[Aurelien Bompard]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : b9f5bae396a444fec35b9e5eba93b6a7485a7125
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2007-02-15T06:21:29+00:00
Stats  : +24/-6 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/b9f5bae396a444fec35b9e5eba93b6a7485a7125?branch=epel10.2

Log:
fix patch (provided by upstream)

---
diff --git a/amarok-1.4.5-CVE-2006-6979.patch b/amarok-1.4.5-CVE-2006-6979.patch
index 5a67536..46bec40 100644
--- a/amarok-1.4.5-CVE-2006-6979.patch
+++ b/amarok-1.4.5-CVE-2006-6979.patch
@@ -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() );
+ 

diff --git a/amarok.spec b/amarok.spec
index 9beaa26..d2b9974 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -235,6 +235,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 15 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.4.5-3
+- fix patch (provided by upstream)
+
 * Wed Feb 14 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.4.5-2
 - add patch to fix CVE-2006-6979 (bug 228138)