From 637a320e1e5ca390003c6c12133aa6b33dd0a0b5 Mon Sep 17 00:00:00 2001 From: jvdias Date: Thu, 16 Mar 2006 23:32:00 +0000 Subject: [PATCH] Upgrade to upstream version 3.4.3 --- .cvsignore | 2 ++ lftp.spec | 24 +++++++++++++++++------- sources | 2 ++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index e8cdc4a..054a654 100644 --- a/.cvsignore +++ b/.cvsignore @@ -12,3 +12,5 @@ lftp-3.4.0.tar.bz2 lftp-3.4.0.tar.bz2.asc lftp-3.4.1.tar.bz2 lftp-3.4.2.tar.bz2 +lftp-3.4.3.tar.gz +lftp-3.4.3.tar.bz2 diff --git a/lftp.spec b/lftp.spec index 9c2c0b0..9db2a33 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,7 +1,7 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 3.4.2 -Release: 5 +Version: 3.4.3 +Release: 1 License: GPL Group: Applications/Internet Source0: http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2 @@ -13,8 +13,6 @@ Patch173276: lftp-3.3.5-bz173276.patch Patch2: lftp-3.4.1-dont_core.patch Patch181694: lftp-3.4.2-fix-redirect-coredump.patch -#%define debug_package %{nil} - %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 @@ -27,7 +25,8 @@ reliability in mind. #^- now fixed upstream #%patch2 -p1 -b .dont_core #^- now fixed upstream -%patch181694 -p1 -b .bz181694 +#%patch181694 -p1 -b .bz181694 +#^- now fixed upstream %build if pkg-config openssl ; then @@ -39,6 +38,11 @@ LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS export tagname=CC make LIBTOOL=%{_bindir}/libtool +%{?!DEBUG: %define DEBUG 0} +%if %{DEBUG} +%define debug_package %{nil} +%endif + %install rm -rf $RPM_BUILD_ROOT export tagname=CC @@ -49,8 +53,11 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so # Remove files from $RPM_BUILD_ROOT that we aren't shipping. rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a %find_lang %{name} -#/usr/lib/rpm/brp-compress -#exit 0 +%if %{DEBUG} +/usr/lib/rpm/brp-compress +exit 0 +%endif +:; %clean rm -rf $RPM_BUILD_ROOT @@ -77,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lftp/%{version}/proto-sftp.so %changelog +* Thu Mar 16 2006 Jason Vas Dias - 3.4.3-1 +- Upgrade to upstream version 3.4.3 + * Fri Mar 10 2006 Bill Nottingham - 3.4.2-5 - rebuild for ppc TLS issue (#184446) diff --git a/sources b/sources index 90034d7..2e9ad54 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ a572a3ab4490a58bb10b51ef97ef5c30 lftp-3.4.2.tar.bz2 +23ba6191cf33b749a99c236733f8ba7f lftp-3.4.3.tar.gz +87c58c1b94f5d5095c24dbf235ad0aef lftp-3.4.3.tar.bz2