[rpms/amarok] epel10: backport a few upstream fixes, in particular...

[rpms/amarok] epel10: backport a few upstream fixes, in particular...

[Rex Dieter]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10
            Commit : 5de1b51f742fcf4a232f0f32361ce9548f363c6a
            Author : Rex Dieter <rdieter@fedoraproject.org>
            Date   : 2013-05-16T07:07:51-05:00
            Stats  : +4/-52 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/5de1b51f742fcf4a232f0f32361ce9548f363c6a?branch=epel10

            Log:
            backport a few upstream fixes, in particular...

- workaround for qtwebkit/wikipedia related crashes (kde #319371)

---
diff --git a/.gitignore b/.gitignore
index 5c31325..597e188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/amarok-2.7.0.tar.bz2
+/amarok-2.7.1.tar.bz2

diff --git a/0221-MySqlEmbeddedStorage-don-t-use-QString-toAscii-fix-b.patch b/0221-MySqlEmbeddedStorage-don-t-use-QString-toAscii-fix-b.patch
deleted file mode 100644
index 1e58ce7..0000000
--- a/0221-MySqlEmbeddedStorage-don-t-use-QString-toAscii-fix-b.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7b8266baf2f0c3afac70b8cbbc561c473a6f1322 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Laitl?= <matej@laitl.cz>
-Date: Tue, 9 Apr 2013 22:40:05 +0200
-Subject: [PATCH 221/289] MySqlEmbeddedStorage: don't use QString::toAscii(),
- fix bug 313914
-
-It is 2013. We have more characters than 128.
-
-BUGFIXES:
- * Fix inability to create database when home directory contains
-   non-ASCII characters.
-
-BUG: 313914
-FIXED-IN: 2.8
----
- ChangeLog                                                           | 2 ++
- .../collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp    | 6 +++---
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp b/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
-index f48ed4a..0233498 100644
---- a/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
-+++ b/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
-@@ -60,7 +60,7 @@ MySqlEmbeddedStorage::MySqlEmbeddedStorage( const QString &storageLocation )
-         }
-         QTextStream out( &df );
-         out << "[embedded]" << endl;
--        out << "datadir = " << databaseDir.toAscii().data() << endl;
-+        out << "datadir = " << databaseDir.toLocal8Bit() << endl;
-         // CAUTION: if we ever change the table type we will need to fix a number of MYISAM specific
-         // functions, such as FULLTEXT indexing.
-         out << "default-storage-engine = MyISAM" << endl;
-@@ -81,8 +81,8 @@ MySqlEmbeddedStorage::MySqlEmbeddedStorage( const QString &storageLocation )
-         dir.mkpath( "." );
-     }
- 
--    setenv( "MYSQL_HOME", storagePath.toAscii().data(), 1 );
--    setenv( "DEFAULT_HOME_ENV", storagePath.toAscii().data(), 1 );
-+    setenv( "MYSQL_HOME", storagePath.toLocal8Bit().data(), 1 );
-+    setenv( "DEFAULT_HOME_ENV", storagePath.toLocal8Bit().data(), 1 );
-     char *args[] = { (char*) "amarok" };
-     if( mysql_library_init( 1 , args, 0 ) != 0 )
-     {
--- 
-1.7.11.7
-

diff --git a/amarok.spec b/amarok.spec
index 6a4642c..bc0a9b1 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.7.0
-Release: 4%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -24,7 +24,6 @@ Patch0:  amarok-2.7.0-onlinedoc.patch
 ## upstream patches
 Patch0057: 0057-Fix-crashed-when-dynamic-playlist-based-on-last.fm-i.patch
 Patch0074: 0074-Fix-Amarok-crashes-by-putting-a-broadcast-in-the-pla.patch
-Patch0221: 0221-MySqlEmbeddedStorage-don-t-use-QString-toAscii-fix-b.patch
 Patch0263: 0263-Fix-crashes-on-track-change-both-with-Phonon-GStream.patch
 
 BuildRequires: curl-devel
@@ -103,7 +102,6 @@ BuildArch: noarch
 
 %patch0057 -p1 -b .0057
 %patch0074 -p1 -b .0074
-%patch0221 -p1 -b .0221
 %patch0263 -p1 -b .0263
 
 

diff --git a/sources b/sources
index 60bd9b9..8f8909d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ccb750a9e86ce17d4172f770ac7a663  amarok-2.7.0.tar.bz2
+855203770cfb43be39bd9b961540dbaf  amarok-2.7.1.tar.bz2