From f37a164df23c08c3c13a72e6380a84359529e8f852d476f34584ce83213b4a0f Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Tue, 14 Apr 2015 10:38:26 +0000 Subject: [PATCH] fix OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=171 --- configuration-tweaks.tar.bz2 | 4 ++-- install.inc | 1 + mariadb.spec | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index d34b51f..c986989 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4aa62499d5bcff38f7c077245fc896160539eef671aa1588bd7d65defd6bbe78 -size 219 +oid sha256:746bd24dc78bad63f5066c36c42743f66ea387359388ea22787d1dc51ca0045a +size 221 diff --git a/install.inc b/install.inc index 1299f88..4045a7e 100644 --- a/install.inc +++ b/install.inc @@ -11,6 +11,7 @@ rm -f %buildroot%_libdir/*.a [ \! -f "%buildroot%_libdir/"libmysqld.static ] || mv "%buildroot%_libdir/"libmysqld.static "%buildroot%_libdir/"libmysqld.a rm -f %buildroot%_libdir/mysql/{,plugin}/*.{a,la} rm -f %buildroot%_libdir/mysql/libndbclient.* +rm -f %buildroot%_libdir/mysql/plugin/debug_key_management.so rm -f %{buildroot}/usr/share/mysql-test/{mysql-test-run,mtr} rm -f %{buildroot}/usr/share/mysql/{binary-configure,errmsg-utf8.txt,magic,mysql-log-rotate,mysql*.server} rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini diff --git a/mariadb.spec b/mariadb.spec index d157e75..c468ba1 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -27,13 +27,13 @@ %endif %if 0 > 0 -%define_with_jemalloc 1 -%define_with_oqgraph 1 -%define_with_cassandra 1 +%define with_jemalloc 1 +%define with_oqgraph 1 +%define with_cassandra 1 %else -%define_with_jemalloc 0 -%define_with_oqgraph 0 -%define_with_cassandra 0 +%define with_jemalloc 0 +%define with_oqgraph 0 +%define with_cassandra 0 %endif Name: mariadb