Replace readline by editline

This commit is contained in:
Marian Csontos 2021-03-16 16:16:58 +01:00
parent 93a554b98c
commit 24098c7fd8

View File

@ -49,7 +49,7 @@ Name: lvm2
Epoch: %{rhel} Epoch: %{rhel}
%endif %endif
Version: 2.03.11 Version: 2.03.11
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 License: GPLv2
URL: https://sourceware.org/lvm2/ URL: https://sourceware.org/lvm2/
Source0: https://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz Source0: https://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz
@ -93,7 +93,7 @@ BuildRequires: gcc-c++
BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel
BuildRequires: libblkid-devel >= %{util_linux_version} BuildRequires: libblkid-devel >= %{util_linux_version}
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: compat-readline5-devel BuildRequires: libedit
BuildRequires: libaio-devel BuildRequires: libaio-devel
%if %{enable_cluster} %if %{enable_cluster}
BuildRequires: corosynclib-devel >= %{corosync_version} BuildRequires: corosynclib-devel >= %{corosync_version}
@ -171,11 +171,6 @@ or more physical volumes and creating one or more logical volumes
%global _udevdir %{_prefix}/lib/udev/rules.d %global _udevdir %{_prefix}/lib/udev/rules.d
# NOTE: Using CFLAGS and LDFLAGS would override the fedora default flags, thus
# using paths here...
export CPATH="%{_includedir}/readline5"
export LIBRARY_PATH="%{_libdir}/readline5"
%configure \ %configure \
--with-default-dm-run-dir=%{_default_dm_run_dir} \ --with-default-dm-run-dir=%{_default_dm_run_dir} \
--with-default-run-dir=%{_default_run_dir} \ --with-default-run-dir=%{_default_run_dir} \
@ -193,6 +188,8 @@ export LIBRARY_PATH="%{_libdir}/readline5"
--enable-cmdlib \ --enable-cmdlib \
--enable-dmeventd \ --enable-dmeventd \
--enable-blkid_wiping \ --enable-blkid_wiping \
--disable-readline \
--enable-editline \
%if %{enable_cluster} %if %{enable_cluster}
--with-cluster=internal \ --with-cluster=internal \
%if %{enable_cmirror} %if %{enable_cmirror}
@ -766,6 +763,9 @@ An extensive functional testsuite for LVM2.
%endif %endif
%changelog %changelog
* Tue Mar 16 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.03.11-3
- Replace readline library with editline.
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.03.11-2 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.03.11-2
- Rebuilt for updated systemd-rpm-macros - Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583. See https://pagure.io/fesco/issue/2583.