From bb670b71888a93ee0759952125fff9431ddf0a0d Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Jun 04 2012 06:48:48 +0000 Subject: updated to latest upstream 4.3.7 --- diff --git a/.gitignore b/.gitignore index d564050..d1d7661 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ lftp-4.0.10.tar.xz /lftp-4.3.3.tar.xz /lftp-4.3.4.tar.xz /lftp-4.3.6.tar.xz +/lftp-4.3.7.tar.xz diff --git a/lftp-4.3.3-tmprec.patch b/lftp-4.3.3-tmprec.patch deleted file mode 100644 index 88b4475..0000000 --- a/lftp-4.3.3-tmprec.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up lftp-4.3.3/src/commands.cc.tmprec lftp-4.3.3/src/commands.cc ---- lftp-4.3.3/src/commands.cc.tmprec 2011-11-16 12:50:49.885538761 +0100 -+++ lftp-4.3.3/src/commands.cc 2011-11-16 12:59:34.008576204 +0100 -@@ -1542,20 +1542,7 @@ const char *FileSetOutput::parse_argv(co - time_fmt.set("%Y-%m-%d \n%m-%d %H:%M"); - else - time_fmt.set(time_style); -- need_exact_time=false; -- if(time_fmt) { -- static const char exact_fmts[][3]={"%H","%M","%S","%N",""}; -- int sep=strcspn(time_fmt,"\n|"); -- for(int i=0; exact_fmts[i][0]; i++) { -- const char *f=strstr(time_fmt,exact_fmts[i]); -- if(!f) -- continue; -- if(i>1 || sep>f-time_fmt) { -- need_exact_time=true; -- break; -- } -- } -- } -+ need_exact_time = time_fmt && strpbrk(time_fmt, "TrSs"); - } - - // remove parsed options. diff --git a/lftp.spec b/lftp.spec index 1538959..d19e38d 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,6 +1,6 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 4.3.6 +Version: 4.3.7 Release: 1%{?dist} License: GPLv3+ Group: Applications/Internet @@ -11,7 +11,6 @@ BuildRequires: ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext Patch1: lftp-4.0.9-date_fmt.patch Patch2: lftp-4.2.0-man.patch -Patch3: lftp-4.3.3-tmprec.patch %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job @@ -33,7 +32,6 @@ Utility scripts for use with lftp. %patch1 -p1 -b .date_fmt %patch2 -p1 -b .man -%patch3 -p1 -b .tmprec #sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure sed -i.norpath -e \ @@ -96,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 04 2012 Jiri Skala - 4.3.7-1 +- updated to latest upstream 4.3.7 + * Mon Apr 02 2012 Jiri Skala - 4.3.6-1 - updated to latest upstream 4.3.6 diff --git a/sources b/sources index 738fe79..84bf9e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffcdbaec5d1416cb6dd754efd43fa61a lftp-4.3.6.tar.xz +df7c928644866712ad8fc1677f42fc30 lftp-4.3.7.tar.xz