diff --git a/libedit.spec b/libedit.spec index 4a5999c..4f9c629 100644 --- a/libedit.spec +++ b/libedit.spec @@ -1,7 +1,7 @@ %define pkgver %(echo %version | tr _ -) Name: libedit Version: 20210910_3.1 -Release: 1mamba +Release: 2mamba Summary: The NetBSD Editline library. Group: System/Libraries Vendor: openmamba @@ -56,6 +56,9 @@ iconv --from-code ISO8859-1 --to-code UTF-8 ./ChangeLog \ [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall +# Fix conflict with libreadline-devel +mv %{buildroot}%{_mandir}/man3/{history.3,el_history.3} + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -89,6 +92,9 @@ iconv --from-code ISO8859-1 --to-code UTF-8 ./ChangeLog \ %{_libdir}/libedit.la %changelog +* Sun Jan 02 2022 Silvan Calarco 20210910_3.1-2mamba +- rename man3/history.3 to fix conflict with libreadline-devel + * Sun Dec 26 2021 Silvan Calarco 20210910_3.1-1mamba - update to 20210910_3.1