[rpms/amarok] epel10.2: fix mysql stuff harder

[rpms/amarok] epel10.2: fix mysql stuff harder

[Rex Dieter]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10.2
            Commit : 1e2c4686e8299a2db8e7aad401fa54704afa9e83
            Author : Rex Dieter <rdieter@math.unl.edu>
            Date   : 2015-12-10T12:19:13-06:00
            Stats  : +47/-15 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/1e2c4686e8299a2db8e7aad401fa54704afa9e83?branch=epel10.2

            Log:
            fix mysql stuff harder

Turns out non-embedded mysql is needed too, but only for an optional plugin

---
diff --git a/amarok-2.8.90-find_mysql.patch b/amarok-2.8.90-find_mysql.patch
new file mode 100644
index 0000000..816b551
--- /dev/null
+++ b/amarok-2.8.90-find_mysql.patch
@@ -0,0 +1,28 @@
+diff -up amarok-2.8.90/cmake/modules/FindMySQLAmarok.cmake.mysql amarok-2.8.90/cmake/modules/FindMySQLAmarok.cmake
+--- amarok-2.8.90/cmake/modules/FindMySQLAmarok.cmake.mysql	2015-06-11 00:24:42.000000000 -0500
++++ amarok-2.8.90/cmake/modules/FindMySQLAmarok.cmake	2015-12-10 12:06:39.235741796 -0600
+@@ -63,15 +63,15 @@ else(MYSQLCONFIG_EXECUTABLE)
+       PATHS
+         ~/usr/lib/mysql
+         /opt/mysql/mysql/lib 
+-        usr/mysql/lib/mysql
+-        opt/local/lib/mysql5/mysql
+-        opt/mysqle/lib/mysql
+-        usr/lib/mysql
+-        usr/lib64/mysql
+-        usr/lib64
+-        usr/local/lib/mysql
+-        opt/local/lib/mysql
+-        opt/ports/lib/mysql5/mysql
++        /usr/mysql/lib/mysql
++        /opt/local/lib/mysql5/mysql
++        /opt/mysqle/lib/mysql
++        /usr/lib/mysql
++        /usr/lib64/mysql
++        /usr/lib64
++        /usr/local/lib/mysql
++        /opt/local/lib/mysql
++        /opt/ports/lib/mysql5/mysql
+     )
+ 
+     find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld_pic mysqld libmysqld

diff --git a/amarok-2.8.90-mysql_embedded.patch b/amarok-2.8.90-mysql_embedded.patch
deleted file mode 100644
index 4425278..0000000
--- a/amarok-2.8.90-mysql_embedded.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up amarok-2.8.90/CMakeLists.txt.mysql_embedded amarok-2.8.90/CMakeLists.txt
---- amarok-2.8.90/CMakeLists.txt.mysql_embedded	2015-12-10 11:44:35.094776255 -0600
-+++ amarok-2.8.90/CMakeLists.txt	2015-12-10 11:43:04.047091677 -0600
-@@ -142,7 +142,7 @@ if( WITH_PLAYER )
-     else( WITH_MYSQL_EMBEDDED )
-         add_definitions( "-DNO_MYSQL_EMBEDDED" )
-     endif( WITH_MYSQL_EMBEDDED )
--    macro_log_feature( MYSQL_FOUND "mysql" "MySQL Server Libraries" "http://www.mysql.com" TRUE "" "" )
-+    macro_log_feature( MYSQL_EMBEDDED_FOUND "mysql" "MySQL Server Libraries" "http://www.mysql.com" TRUE "" "" )
- 
-     # zlib is required for mysql embedded
-     find_package(ZLIB REQUIRED)

diff --git a/amarok-2.8.90-mysql_found.patch b/amarok-2.8.90-mysql_found.patch
new file mode 100644
index 0000000..44a94ff
--- /dev/null
+++ b/amarok-2.8.90-mysql_found.patch
@@ -0,0 +1,12 @@
+diff -up amarok-2.8.90/CMakeLists.txt.mysql_embedded amarok-2.8.90/CMakeLists.txt
+--- amarok-2.8.90/CMakeLists.txt.mysql_embedded	2015-12-10 11:44:35.094776255 -0600
++++ amarok-2.8.90/CMakeLists.txt	2015-12-10 11:43:04.047091677 -0600
+@@ -142,7 +142,7 @@ if( WITH_PLAYER )
+     else( WITH_MYSQL_EMBEDDED )
+         add_definitions( "-DNO_MYSQL_EMBEDDED" )
+     endif( WITH_MYSQL_EMBEDDED )
+-    macro_log_feature( MYSQL_FOUND "mysql" "MySQL Server Libraries" "http://www.mysql.com" TRUE "" "" )
++    macro_log_feature( MYSQL_EMBEDDED_FOUND "mysql" "MySQL Server Libraries" "http://www.mysql.com" FALSE "" "" )
+ 
+     # zlib is required for mysql embedded
+     find_package(ZLIB REQUIRED)

diff --git a/amarok.spec b/amarok.spec
index 2236d6f..5b0f9dd 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -29,8 +29,10 @@ Patch0:  amarok-2.8.0-onlinedoc.patch
 Patch1: amarok-2.8.0-no_kdewebkit.patch
 
 ## upstreamable patches
-# all amarok cares about is mysql_embedded_found, not mysql_found
-Patch100: amarok-2.8.90-mysql_embedded.patch
+# make mysql_found non-fatal
+Patch100: amarok-2.8.90-mysql_found.patch
+# fix detection of mysql_libraries in non-mysqlconfig case
+Patch101: amarok-2.8.90-find_mysql.patch
 
 ## upstream patches
 Patch3: 0003-Fix-TagLib-version-check.patch
@@ -47,6 +49,7 @@ BuildRequires: kdelibs4-webkit-devel
 %if 0%{?fedora} > 20
 BuildRequires: libappstream-glib
 %endif
+BuildRequires: mysql-devel
 BuildRequires: mysql-embedded-devel
 BuildRequires: pkgconfig(gdk-pixbuf-2.0)
 BuildRequires: pkgconfig(glib-2.0) pkgconfig(gobject-2.0)
@@ -141,7 +144,8 @@ Requires: %{name} = %{version}-%{release}
 %patch3 -p1 -b .taglib_version_check
 
 ## upstreamable
-%patch100 -p1 -b .mysql_embedded
+#patch100 -p1 -b .mysql_found
+%patch101 -p1 -b .find_mysql
 
 
 %build