Rebase to latest upstream and move editrc man page to base package

This commit is contained in:
Boris Ranto 2015-01-12 07:25:12 +01:00
parent 792758b700
commit 05729bbcbf

View File

@ -1,9 +1,10 @@
%global snap 20140213 %global snap 20141030
%global dir_snap 20141029
Summary: The NetBSD Editline library Summary: The NetBSD Editline library
Name: libedit Name: libedit
Version: 3.1 Version: 3.1
Release: 8.%{snap}cvs%{?dist} Release: 9.%{snap}cvs%{?dist}
License: BSD License: BSD
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.thrysoee.dk/editline/ URL: http://www.thrysoee.dk/editline/
@ -27,7 +28,7 @@ Requires: ncurses-devel
This package contains development files for %{name}. This package contains development files for %{name}.
%prep %prep
%setup -q -n %{name}-%{snap}-%{version} %setup -q -n %{name}-%{dir_snap}-%{version}
# Suppress rpmlint error. # Suppress rpmlint error.
iconv -f ISO8859-1 -t UTF-8 -o ChangeLog.utf-8 ChangeLog iconv -f ISO8859-1 -t UTF-8 -o ChangeLog.utf-8 ChangeLog
@ -54,12 +55,12 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%doc ChangeLog THANKS %doc ChangeLog THANKS
%{_mandir}/man5/editrc.5*
%{_libdir}/%{name}.so.* %{_libdir}/%{name}.so.*
%files devel %files devel
%doc examples/fileman.c examples/tc1.c examples/wtc1.c %doc examples/fileman.c examples/tc1.c examples/wtc1.c
%{_mandir}/man3/* %{_mandir}/man3/*
%{_mandir}/man5/editrc.5*
%{_includedir}/histedit.h %{_includedir}/histedit.h
%{_libdir}/%{name}.so %{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
@ -68,6 +69,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
%{_includedir}/editline/readline.h %{_includedir}/editline/readline.h
%changelog %changelog
* Mon Jan 12 2015 Boris Ranto <branto@redhat.com> - 3.1-9.20141030cvs
- Rebase to latest upstream release
- Fix rhbz#1180529
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-8.20140213cvs * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-8.20140213cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild