From add62fbfc9333ca17a78fa7552bfcdb28c6ff03c Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Sep 16 2010 10:29:47 +0000
Subject: Merge commit '834a7c34f60be65b1ebf87935f41ed74eea8f4bf' into el5


Conflicts:
	bti.spec

---

diff --git a/bti-026-readline5.patch b/bti-026-readline5.patch
new file mode 100644
index 0000000..c06a875
--- /dev/null
+++ b/bti-026-readline5.patch
@@ -0,0 +1,20 @@
+--- bti-026/Makefile.in.readline5	2010-05-19 21:10:24.000000000 +0200
++++ bti-026/Makefile.in	2010-05-20 21:21:21.821092123 +0200
+@@ -76,7 +76,7 @@
+   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ SCRIPTS = $(bin_SCRIPTS)
+-DEFAULT_INCLUDES = -I.@am__isrc@
++DEFAULT_INCLUDES = -I.@am__isrc@ -I/usr/include/readline5
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+@@ -141,7 +141,7 @@
+ LIBCURL = @LIBCURL@
+ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -ldl -lreadline
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
diff --git a/bti.spec b/bti.spec
index b8cdafb..e52b8ee 100644
--- a/bti.spec
+++ b/bti.spec
@@ -7,10 +7,11 @@ Group:          Applications/Internet
 License:        GPLv2
 URL:            http://www.kernel.org/pub/linux/kernel/people/gregkh/bti
 Source0:        http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2
+Patch0:         bti-026-readline5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # still supporting EL-5, rename to libcurl-devel once this changes
-BuildRequires:  curl-devel readline-devel libxml2-devel pcre-devel
+BuildRequires:  curl-devel compat-readline5-devel libxml2-devel pcre-devel
 #Requires:       
 
 %description
@@ -20,11 +21,12 @@ and fast manner to annoy the whole world.
 
 %prep
 %setup -q
+%patch0 -p1 -b .readline5
 
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LDFLAGS="-L%{_libdir}/readline5"
 
 
 %install