diff --git a/lvm2.spec b/lvm2.spec index 9180539..66b641a 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -49,7 +49,7 @@ Name: lvm2 Epoch: %{rhel} %endif Version: 2.03.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: https://sourceware.org/lvm2/ 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: libblkid-devel >= %{util_linux_version} BuildRequires: ncurses-devel -BuildRequires: compat-readline5-devel +BuildRequires: libedit BuildRequires: libaio-devel %if %{enable_cluster} 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 -# 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 \ --with-default-dm-run-dir=%{_default_dm_run_dir} \ --with-default-run-dir=%{_default_run_dir} \ @@ -193,6 +188,8 @@ export LIBRARY_PATH="%{_libdir}/readline5" --enable-cmdlib \ --enable-dmeventd \ --enable-blkid_wiping \ + --disable-readline \ + --enable-editline \ %if %{enable_cluster} --with-cluster=internal \ %if %{enable_cmirror} @@ -766,6 +763,9 @@ An extensive functional testsuite for LVM2. %endif %changelog +* Tue Mar 16 2021 Zbigniew Jędrzejewski-Szmek - 2.03.11-3 +- Replace readline library with editline. + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.03.11-2 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583.