Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2017-11-26 10:34:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok" Sun Nov 26 10:34:58 2017 rev:110 rq:545319 version:2.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2017-11-16 14:17:49.685078095 +0100 +++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2017-11-26 10:35:00.070768006 +0100 @@ -1,0 +2,16 @@ +Fri Nov 24 13:33:14 UTC 2017 - [email protected] + +- Fix build with libmariadb by disabling using + mysql_config/mariadb_config (DMYSQLCONFIG_EXECUTABLE:BOOL=OFF) + and let find_library() find respective libraries in predefined + paths [bsc#1067898] +- Add amarok-2.8.0-find_mysql.patch to fix obvious typo in paths + definition in find_library() + +------------------------------------------------------------------- +Fri Nov 24 11:00:10 UTC 2017 - [email protected] + +- BuildIgnore openssl 1.0 headers to not conflict with 1.1 headers + required by some deps + +------------------------------------------------------------------- New: ---- amarok-2.8.0-find_mysql.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.lnxmWx/_old 2017-11-26 10:35:02.650673931 +0100 +++ /var/tmp/diff_new_pack.lnxmWx/_new 2017-11-26 10:35:02.654673785 +0100 @@ -65,14 +65,14 @@ Patch112: Fix-MPRIS2-DesktopEntry-value.patch # PATCH-FIX-UPSTREAM Fix-crash-during-musicbrainz-search.patch kde#328359 -- Fix a possible crash when looking up metadata on MusicBrainz Patch113: Fix-crash-during-musicbrainz-search.patch +# PATCH-FIX-UPSTREAM amarok-2.8.0-find_mysql.patch -- Fix obvious typo in paths definition in find_library() +Patch114: amarok-2.8.0-find_mysql.patch # Required for the fdupes macro BuildRequires: fdupes BuildRequires: gdk-pixbuf-devel BuildRequires: libcurl-devel BuildRequires: libgcrypt-devel -%if 0%{?suse_version} < 1330 BuildRequires: libgpod-devel >= 0.7.0 -%endif BuildRequires: libkde4-devel >= 4.6.0 BuildRequires: liblastfm-devel BuildRequires: libmtp-devel @@ -80,9 +80,8 @@ BuildRequires: libmysqlclient-devel BuildRequires: libmysqld-devel BuildRequires: libofa-devel -%if 0%{?suse_version} >= 1330 -BuildRequires: libopenssl-1_0_0-devel -%else +#!BuildIgnore: libopenssl-1_0_0-devel +%if 0%{?suse_version} < 1330 BuildRequires: openssl-devel %endif BuildRequires: libqca2-devel @@ -98,18 +97,14 @@ BuildRequires: qt4-qtscript BuildRequires: taglib BuildRequires: taglib-devel >= 1.7 -%if 0%{?suse_version} < 1330 BuildRequires: taglib-extras-devel >= 1.0 -%endif BuildRequires: tcpd-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) -%if 0%{?suse_version} < 1330 Requires: libtag-extras1 >= 1.0 -%endif Requires: phonon-backend Requires: taglib >= 1.7 Requires(post): shared-mime-info @@ -154,6 +149,7 @@ %patch111 -p1 %patch112 -p1 %patch113 -p1 +%patch114 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE99} '+%%b %%e %%Y') @@ -163,7 +159,8 @@ %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%cmake_kde4 -d build +# force not to use MYSQLCONFIG as mariadb_config provided by mariadb-connector-c doesn't support "--libmysqld-libs" option anymore +%cmake_kde4 -d build -- -DMYSQLCONFIG_EXECUTABLE:BOOL=OFF %make_jobs %install ++++++ amarok-2.8.0-find_mysql.patch ++++++ >From 745b2e18c5b58cfabcbf6e7863572122d673692e Mon Sep 17 00:00:00 2001 From: Rex Dieter <[email protected]> Date: Fri, 11 Dec 2015 07:12:09 -0600 Subject: [PATCH] fix apparent/obvious error (typo?) in find_library(MYSQL_LIBRARIES... --- cmake/modules/FindMySQLAmarok.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake index dffce31da0..275005c8a4 100644 --- a/cmake/modules/FindMySQLAmarok.cmake +++ b/cmake/modules/FindMySQLAmarok.cmake @@ -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
