From 99838cbeb9018bc677e7fa5902e956d74bc011b8 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Tue, 28 Jun 2016 18:10:32 +0200 Subject: [PATCH] Fix file conflict with readline Resolves: rhbz#1349671 --- libedit.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libedit.spec b/libedit.spec index 6588ef9..5783511 100644 --- a/libedit.spec +++ b/libedit.spec @@ -4,7 +4,7 @@ Summary: The NetBSD Editline library Name: libedit Version: 3.1 -Release: 15.%{snap}cvs%{?dist} +Release: 16.%{snap}cvs%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.thrysoee.dk/editline/ @@ -46,6 +46,8 @@ make %{?_smp_mflags} %install make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete +# See rhbz#1349671 +rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/history.3* %post -p /sbin/ldconfig @@ -69,6 +71,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete %{_includedir}/editline/readline.h %changelog +* Tue Jun 28 2016 Boris Ranto - 0:3.1-16.20160618cvs +- Fix file conflict with readline (rhbz#1349671) + * Tue Jun 21 2016 Boris Ranto - 0:3.1-15.20160618cvs - New version (0:3.1-15.20160618)