diff --git a/.cvsignore b/.cvsignore index b6fe1b4..f92e502 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lftp-2.5.2.tar.gz +lftp-2.6.3.tar.gz diff --git a/lftp.spec b/lftp.spec index 66feb2a..ee73c20 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,14 +1,14 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 2.5.2 -Release: 6 +Version: 2.6.3 +Release: 3 License: GPL Group: Applications/Internet -Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.gz -Patch0: lftp-2.6.9-ulf.patch +Source: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.gz +Source1: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.gz.asc URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: ncurses-devel, openssl-devel, readline-devel +BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job @@ -17,18 +17,27 @@ mirroring, and can transfer several files in parallel. It is designed with reliability in mind. %prep -%setup -q -%patch0 -p1 -b .ulf +%setup -q %build -LDFLAGS=-L`pwd`/src/.libs ; export LDFLAGS -%configure --with-modules -make +if pkg-config openssl ; then + CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS + LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS +fi +LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS +%configure --with-modules --disable-static --with-ssl +make LIBTOOL=libtool %install rm -rf $RPM_BUILD_ROOT %makeinstall +rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/* +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} %clean @@ -52,9 +61,26 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lftp/%{version}/proto-http.so %changelog -* Tue Dec 9 2003 Nalin Dahyabhai 2.5.2-6 -- include patch based on patch from Ulf Härnhammar to fix unsafe use of - sscanf when reading http directory listings (CAN-2003-0963) +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai 2.6.3-2 +- rebuild + +* Thu Dec 12 2002 Nalin Dahyabhai +- use openssl's pkg-config data, if available + +* Thu Nov 14 2002 Nalin Dahyabhai 2.6.3-1 +- update to 2.6.3 + +* Tue Nov 12 2002 Tim Powers 2.6.2-2 +- remove files we aren't including from the $$RPM_BUILD_ROOT + +* Fri Oct 4 2002 Nalin Dahyabhai 2.6.2-1 +- build with the system's libtool + +* Thu Sep 26 2002 Nalin Dahyabhai +- update to 2.6.2 * Sat Aug 10 2002 Elliot Lee - rebuilt with gcc-3.2 (we hope) diff --git a/sources b/sources index ed16353..66a583a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a563aa3d2745fa8aadf505213f6ad42a lftp-2.5.2.tar.gz +e9946091537948b92f5da227de642f5b lftp-2.6.3.tar.gz