diff --git a/.cvsignore b/.cvsignore index f2a04da..7724049 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bti-023.tar.bz2 +bti-026.tar.bz2 diff --git a/bti-023-readline5.patch b/bti-023-readline5.patch deleted file mode 100644 index 3ae9fed..0000000 --- a/bti-023-readline5.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- bti-023/Makefile.in.readline5 2009-05-27 16:41:17.000000000 -0400 -+++ bti-023/Makefile.in 2009-08-20 01:51:23.388938140 -0400 -@@ -54,7 +54,7 @@ - bti_LDADD = $(LDADD) - binSCRIPT_INSTALL = $(INSTALL_SCRIPT) - 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 - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -105,7 +105,7 @@ - LIBCURL = @LIBCURL@ - LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lreadline - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ 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 98ff446..e52b8ee 100644 --- a/bti.spec +++ b/bti.spec @@ -1,5 +1,5 @@ Name: bti -Version: 023 +Version: 026 Release: 1%{?dist} Summary: Bash Twitter/Identi.ca Idiocy @@ -7,7 +7,7 @@ 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-023-readline5.patch +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 @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 20 2010 Michel Salim - 026-1 +- Update to 026 + * Wed Aug 19 2009 Michel Salim - 023-1 - Update to 023 - Build against readline v5, due to licensing incompatibilities with v6 diff --git a/sources b/sources index ae61579..15a6a90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93b86457e13b838d3118b7eed4e0a38b bti-023.tar.bz2 +dc8fab965bb55587c70fbebd5b0ac862 bti-026.tar.bz2