From 05729bbcbfdbe8789372f4e6447d364cf2b80ab2 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Mon, 12 Jan 2015 07:25:12 +0100
Subject: [PATCH] Rebase to latest upstream and move editrc man page to base
 package

---
 libedit.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/libedit.spec b/libedit.spec
index 58269e2..1a91f2c 100644
--- a/libedit.spec
+++ b/libedit.spec
@@ -1,9 +1,10 @@
-%global snap 20140213
+%global snap 20141030
+%global dir_snap 20141029
 
 Summary:	The NetBSD Editline library
 Name:		libedit
 Version:	3.1
-Release:	8.%{snap}cvs%{?dist}
+Release:	9.%{snap}cvs%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.thrysoee.dk/editline/
@@ -27,7 +28,7 @@ Requires:	ncurses-devel
 This package contains development files for %{name}.
 
 %prep
-%setup -q -n %{name}-%{snap}-%{version}
+%setup -q -n %{name}-%{dir_snap}-%{version}
 
 # Suppress rpmlint error.
 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}
 %license COPYING
 %doc ChangeLog THANKS
+%{_mandir}/man5/editrc.5*
 %{_libdir}/%{name}.so.*
 
 %files devel
 %doc examples/fileman.c examples/tc1.c examples/wtc1.c
 %{_mandir}/man3/*
-%{_mandir}/man5/editrc.5*
 %{_includedir}/histedit.h
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
@@ -68,6 +69,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 %{_includedir}/editline/readline.h
 
 %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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild