From 25c91e6c8128fe321780761e342d45cd8d0b5d30 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 3 Mar 2018 20:07:31 -0700 Subject: [PATCH] Add gcc BR. Also: - Build verbosely. - Drop obsolete --enable-widec configure option. - Fix "unused direct shared library dependency" warning from rpmlint again. - Fix man page error due to BSD nroff macro that is not available on Linux. - Drop explicit R on pkgconfig from the -devel package, autogenerated. --- libedit.spec | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/libedit.spec b/libedit.spec index 827efae..80c4334 100644 --- a/libedit.spec +++ b/libedit.spec @@ -4,11 +4,12 @@ Summary: The NetBSD Editline library Name: libedit Version: 3.1 -Release: 22.%{snap}cvs%{?dist} +Release: 23.%{snap}cvs%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.thrysoee.dk/editline/ Source0: http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz +BuildRequires: gcc BuildRequires: ncurses-devel %description @@ -21,8 +22,7 @@ Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: ncurses-devel +Requires: ncurses-devel%{?_isa} %description devel This package contains development files for %{name}. @@ -35,11 +35,17 @@ iconv -f ISO8859-1 -t UTF-8 -o ChangeLog.utf-8 ChangeLog touch -r ChangeLog ChangeLog.utf-8 mv -f ChangeLog.utf-8 ChangeLog +# Replace an nroff macro that is not available, and not needed, on Linux +sed -i 's,\\\*\[Gt\],>,' doc/editline.3.roff + %build -%configure --disable-static --enable-widec +%configure --disable-static --disable-silent-rules # Fix unused direct shared library dependencies. -sed -i "s/lcurses/ltinfo/" src/Makefile +sed -i "s/lncurses/ltinfo/" src/Makefile + +# Downstream projects do not need to link with ncurses, just libedit. +sed -i "s/ -lncurses//" libedit.pc make %{?_smp_mflags} @@ -69,6 +75,14 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/history.3* %{_includedir}/editline/readline.h %changelog +* Sat Mar 3 2018 Jerry James - 3.1-23.20170329cvs +- Add gcc BR +- Build verbosely +- Drop obsolete --enable-widec configure option +- Fix "unused direct shared library dependency" warning from rpmlint again +- Fix man page error due to BSD nroff macro that is not available on Linux +- Drop explicit R on pkgconfig from the -devel package, autogenerated + * Wed Feb 07 2018 Fedora Release Engineering - 3.1-22.20170329cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild