From a44ec6dfe12cfc398aa7c5314a665e60fff51b4127b086e784084865350d6c90 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 30 Jul 2018 07:07:00 +0000 Subject: [PATCH] Accepting request 625845 from home:kstreitova:branches:server:database - switch to libedit as control sequences were already fixed there so we don't have to avoid it [bsc#1098683] OBS-URL: https://build.opensuse.org/request/show/625845 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=215 --- mariadb.changes | 6 ++++++ mariadb.spec | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mariadb.changes b/mariadb.changes index b85cea5..6063eb2 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 27 20:27:36 UTC 2018 - kstreitova@suse.com + +- switch to libedit as control sequences were already fixed there + so we don't have to avoid it [bsc#1098683] + ------------------------------------------------------------------- Tue Jul 17 12:50:27 UTC 2018 - kstreitova@suse.com diff --git a/mariadb.spec b/mariadb.spec index 8d651ea..4aa2ea2 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -157,12 +157,7 @@ Obsoletes: %{extra_provides}-debug-version < %{version} %ifnarch i586 %{arm} BuildRequires: lzo-devel %endif -# We want readline5 for openSUSE and libedit for SLE12 -%if ( 0%{?suse_version} == 1315 ) && ( ! 0%{?is_opensuse} ) BuildRequires: libedit-devel -%else -BuildRequires: readline5-devel -%endif %if 0%{with_oqgraph} > 0 BuildRequires: judy-devel %if 0%{?suse_version} > 1315