rpms/mariadb
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert previous change, back to libmariadb headers (RHBZ #1474764)

Browse Source
This commit is contained in:
Adam Williamson 2017-07-25 09:10:46 -07:00
parent b97399acb9
commit 6bbbe1d098
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mariadb.spec
View File

@ -126,7 +126,7 @@
Name: mariadb Name: mariadb
Version: %{compatver}.%{bugfixver} Version: %{compatver}.%{bugfixver}
Release: 5%{?with_debug:.debug}%{?dist} Release: 6%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
Summary: A community developed branch of MySQL Summary: A community developed branch of MySQL
@ -766,13 +766,7 @@ make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp
%endif %endif
%install %install
# CMAKE_INSTALL_ALWAYS is a bit of a hacky workaround for make DESTDIR=%{buildroot} install
# 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 # multilib header support
for header in mysql/my_config.h mysql/private/config.h; do for header in mysql/my_config.h mysql/private/config.h; do
@ -1433,6 +1427,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Jul 25 2017 Adam Williamson <awilliam@redhat.com> - 3:10.2.7-6
- Revert previous change, go back to libmariadb headers (RHBZ #1474764)
* Fri Jul 21 2017 Adam Williamson <awilliam@redhat.com> - 3:10.2.7-5 * Fri Jul 21 2017 Adam Williamson <awilliam@redhat.com> - 3:10.2.7-5
- Install correct headers (server, not client) - MDEV-13370 - Install correct headers (server, not client) - MDEV-13370