From b97399acb93dd3560d72509fe3538a47d1a6b47b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 21 Jul 2017 14:56:38 -0700 Subject: [PATCH] Install correct headers (server, not client) - MDEV-13370 --- mariadb.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 3732699..0068f1d 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -126,7 +126,7 @@ Name: mariadb Version: %{compatver}.%{bugfixver} -Release: 4%{?with_debug:.debug}%{?dist} +Release: 5%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A community developed branch of MySQL @@ -766,7 +766,13 @@ make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp %endif %install -make DESTDIR=%{buildroot} install +# CMAKE_INSTALL_ALWAYS is a bit of a hacky workaround for +# https://jira.mariadb.org/browse/MDEV-13370 ; it assumes that +# include/ gets installed *after* libmariadb/include/ , if that +# ever gets reversed, it will do exactly the wrong thing. Make sure +# the mysql.h that ultimately gets installed is the one from include/ +# not the one from libmariadb/include/ . +make DESTDIR=%{buildroot} CMAKE_INSTALL_ALWAYS=1 install # multilib header support for header in mysql/my_config.h mysql/private/config.h; do @@ -1427,6 +1433,9 @@ fi %endif %changelog +* Fri Jul 21 2017 Adam Williamson - 3:10.2.7-5 +- Install correct headers (server, not client) - MDEV-13370 + * Wed Jul 19 2017 Jonathan Wakely - 3:10.2.7-4 - Rebuilt for s390x binutils bug