Hello community, here is the log from the commit of package apr-util for openSUSE:Factory checked in at 2017-11-30 12:43:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apr-util (Old) and /work/SRC/openSUSE:Factory/.apr-util.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apr-util" Thu Nov 30 12:43:57 2017 rev:5 rq:544579 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/apr-util/apr-util.changes 2017-11-11 14:15:03.977183456 +0100 +++ /work/SRC/openSUSE:Factory/.apr-util.new/apr-util.changes 2017-11-30 12:43:57.845032099 +0100 @@ -1,0 +2,6 @@ +Wed Nov 22 16:46:50 UTC 2017 - [email protected] + +- Add apr-util-mariadb-10.2.patch: Fix detection / build with + MariaDB 10.2. + +------------------------------------------------------------------- New: ---- apr-util-mariadb-10.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apr-util.spec ++++++ --- /var/tmp/diff_new_pack.K0iVbY/_old 2017-11-30 12:43:59.504971752 +0100 +++ /var/tmp/diff_new_pack.K0iVbY/_new 2017-11-30 12:43:59.504971752 +0100 @@ -30,6 +30,8 @@ Source: http://www.apache.org/dist/apr/apr-util-%{version}.tar.bz2 Patch1: apr-util-1.4.1-testmemcache-initialize-values-array.patch Patch2: apr-util-visibility.patch +# PATCH-FIX-OPENSUSE apr-util-mariadb-10.2.patch [email protected] -- Fix build with mariadb 10.2 +Patch3: apr-util-mariadb-10.2.patch BuildRequires: apr-devel BuildRequires: autoconf BuildRequires: db-devel @@ -107,6 +109,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build echo 'HTML_TIMESTAMP=NO' >> docs/doxygen.conf ++++++ apr-util-mariadb-10.2.patch ++++++ Index: apr-util-1.6.1/build/dbd.m4 =================================================================== --- apr-util-1.6.1.orig/build/dbd.m4 +++ apr-util-1.6.1/build/dbd.m4 @@ -176,15 +176,13 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ APR_ADDTO(LIBS, [$mysql_LIBS]) fi - AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], + AC_CHECK_HEADERS([mysql.h], AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), - [apu_have_mysql=0; break], - [#include <my_global.h>]) + [apu_have_mysql=0; break]) if test "$apu_have_mysql" = "0"; then - AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], + AC_CHECK_HEADERS([mysql/mysql.h], AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), - [apu_have_mysql=0; break], - [#include <mysql/my_global.h>]) + [apu_have_mysql=0; break]) fi if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
