From 8267e9dc0de870b324d3a839c7d1f358b7faf7b3 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Wed, 2 Sep 2009 06:24:36 +0000 Subject: [PATCH] - updated to latest upstream release --- .cvsignore | 2 +- lftp-3.7.14-decode.patch | 12 ------------ lftp.spec | 11 +++++------ sources | 2 +- 4 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 lftp-3.7.14-decode.patch diff --git a/.cvsignore b/.cvsignore index 9147917..82c10d0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lftp-3.7.14.tar.lzma +lftp-3.7.15.tar.lzma diff --git a/lftp-3.7.14-decode.patch b/lftp-3.7.14-decode.patch deleted file mode 100644 index 7c89511..0000000 --- a/lftp-3.7.14-decode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up lftp-3.7.14/src/url.cc.decode lftp-3.7.14/src/url.cc ---- lftp-3.7.14/src/url.cc.decode 2009-03-20 12:20:14.000000000 +0100 -+++ lftp-3.7.14/src/url.cc 2009-06-10 15:36:30.000000000 +0200 -@@ -366,7 +366,7 @@ int url::decode_string(char *str) - *o++=*p++; - } - *o=0; -- return p-str; -+ return o-str; - } - - const char *url::decode(const char *p) diff --git a/lftp.spec b/lftp.spec index 466c7f1..90a6efa 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,7 +1,7 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 3.7.14 -Release: 6%{?dist} +Version: 3.7.15 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Internet Source0: ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.lzma @@ -9,8 +9,6 @@ URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext -Patch1: lftp-3.7.14-decode.patch - %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job control and uses the readline library for input. It has bookmarks, built-in @@ -29,8 +27,6 @@ Utility scripts for use with lftp. %prep %setup -q -%patch1 -p1 -b .decode - #sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure sed -i.norpath -e \ '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib64 |' \ @@ -91,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 02 2009 Jiri Skala - 3.7.15-1 +- updated to latest upstream release + * Wed Aug 12 2009 Ville Skyttä - 3.7.14-6 - Use lzma compressed upstream tarball. diff --git a/sources b/sources index 1011dfb..cfca335 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -102f675cdc937dd1c4c7a919cf908678 lftp-3.7.14.tar.lzma +7407a8eadacae90c9c6caf542c3f46d2 lftp-3.7.15.tar.lzma