From dee0874457b29393f60d3b3c29bd5f602a8696f1c22e5d47aea6d8c574bc9e39 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 16 Mar 2018 18:25:33 +0000 Subject: [PATCH] Readline version check at build OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=259 --- bash.changes | 5 +++++ bash.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bash.changes b/bash.changes index ec0cb9e..5782075 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 16 17:37:08 UTC 2018 - werner@suse.de + +- Make sure that correct readline-devel version is used (current 7.0) + ------------------------------------------------------------------- Fri Mar 16 06:22:31 UTC 2018 - werner@suse.de diff --git a/bash.spec b/bash.spec index b7c0424..8fb6490 100644 --- a/bash.spec +++ b/bash.spec @@ -29,7 +29,8 @@ BuildRequires: makeinfo BuildRequires: ncurses-devel BuildRequires: patchutils BuildRequires: pkg-config -BuildRequires: readline7-devel +# This has to be always the same version as included in the bash its self +BuildRequires: readline-devel == 7.0 BuildRequires: screen BuildRequires: sed %define bextend %nil @@ -226,6 +227,10 @@ done %endif %patch49 -p0 -b .pthtmp %patch0 -p0 -b .0 +# This has to be always the same version as included in the bash its self +rl1=($(sed -rn '/RL_READLINE_VERSION/p' lib/readline/readline.h)) +rl2=($(sed -rn '/RL_READLINE_VERSION/p' /usr/include/readline/readline.h)) +test ${rl1[2]} = ${rl2[2]} || exit 1 %build LANG=POSIX