[rpms/amarok] epel10.2: workaround 'mysql_config --libmysqld-libs' madness (#1290517)

[rpms/amarok] epel10.2: workaround 'mysql_config --libmysqld-libs' madness (#1290517)

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : cd1f7f0a312db1845788c81db5b16a6983437465
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2015-12-10T11:50:50-06:00
Stats  : +25/-8 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/cd1f7f0a312db1845788c81db5b16a6983437465?branch=epel10.2

Log:
workaround 'mysql_config --libmysqld-libs' madness (#1290517)

---
diff --git a/amarok-2.8.90-mysql_embedded.patch b/amarok-2.8.90-mysql_embedded.patch
new file mode 100644
index 0000000..4425278
--- /dev/null
+++ b/amarok-2.8.90-mysql_embedded.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" TRUE "" "" )
+ 
+     # zlib is required for mysql embedded
+     find_package(ZLIB REQUIRED)

diff --git a/amarok.spec b/amarok.spec
index 933ba39..2236d6f 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -8,7 +8,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.8.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -29,6 +29,8 @@ 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
 
 ## upstream patches
 Patch3: 0003-Fix-TagLib-version-check.patch
@@ -45,12 +47,7 @@ BuildRequires: kdelibs4-webkit-devel
 %if 0%{?fedora} > 20
 BuildRequires: libappstream-glib
 %endif
-%if 0%{?fedora} > 18 || 0%{?rhel} > 6
-BuildRequires: mariadb-embedded-devel
-%else
-# extra libaio linkage comes from use of mysql_config --libs
-BuildRequires: mysql-embedded-devel libaio-devel
-%endif
+BuildRequires: mysql-embedded-devel
 BuildRequires: pkgconfig(gdk-pixbuf-2.0)
 BuildRequires: pkgconfig(glib-2.0) pkgconfig(gobject-2.0)
 BuildRequires: pkgconfig(libxml-2.0)
@@ -143,11 +140,16 @@ Requires: %{name} = %{version}-%{release}
 ## upstream
 %patch3 -p1 -b .taglib_version_check
 
+## upstreamable
+%patch100 -p1 -b .mysql_embedded
+
 
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+# force non-use of MYSQLCONFIG, to avoid (potential bogus) stuff from: mysql_config --libmysqld-libs
+%{cmake_kde4} .. \
+  -DMYSQLCONFIG_EXECUTABLE:BOOL=OFF
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -294,6 +296,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2015 Rex Dieter <rdieter@fedoraproject.org> 2.8.90-3
+- workaround 'mysql_config --libmysqld-libs' madness (#1290517)
+
 * Thu Dec 10 2015 Rex Dieter <rdieter@fedoraproject.org> 2.8.90-2
 - make kde-runtime dep unversioned, use %%license