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-editline.patch b/bti-023-editline.patch deleted file mode 100644 index 24311b9..0000000 --- a/bti-023-editline.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- bti-023/Makefile.in.editline 2009-05-27 16:41:17.000000000 -0400 -+++ bti-023/Makefile.in 2009-08-20 02:31:39.903685450 -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/editline - 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@ -ledit -lcurses - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ ---- bti-023/bti.c.editline 2009-05-27 16:40:23.000000000 -0400 -+++ bti-023/bti.c 2009-08-20 02:32:43.088938899 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/bti.spec b/bti.spec index 79f69d8..b8cdafb 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,11 +7,10 @@ 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-editline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # still supporting EL-5, rename to libcurl-devel once this changes -BuildRequires: curl-devel libedit-devel libxml2-devel pcre-devel +BuildRequires: curl-devel readline-devel libxml2-devel pcre-devel #Requires: %description @@ -21,7 +20,6 @@ and fast manner to annoy the whole world. %prep %setup -q -%patch0 -p1 -b .editline %build @@ -55,10 +53,16 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Aug 20 2009 Michel Salim - 023-1 +* Thu May 20 2010 Michel Salim - 026-1 +- Update to 026 + +* Wed Aug 19 2009 Michel Salim - 023-1 - Update to 023 -- Build against libedit, since the version of readline shipped with RHEL5 is - too old +- Build against readline v5, due to licensing incompatibilities with v6 + (bug #511301) + +* Fri Jul 24 2009 Fedora Release Engineering - 015-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Fri Mar 13 2009 Michel Salim - 015-1 - Update to 015 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