From 5ed7dac8de8ccffc8675029a0f43c2b043301236 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Thu, 2 Oct 2008 13:49:50 +0000 Subject: [PATCH] - Resolves: #464420 re-base to 3.7.4 - replaced usage of OpenSSL by GNUTLS due to license conflict --- .cvsignore | 1 + lftp.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1b0dcf5..2425480 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ lftp-3.7.1.tar.gz +lftp-3.7.4.tar.gz diff --git a/lftp.spec b/lftp.spec index 77311de..636f9e0 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,13 +1,13 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 3.7.1 +Version: 3.7.4 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source0: ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel, gettext +BuildRequires: ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job @@ -27,7 +27,7 @@ if pkg-config openssl ; then CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS fi -%configure --with-modules --disable-static --with-openssl=%{_prefix} --with-debug +%configure --with-modules --disable-static --with-gnutls --without-openssl --with-debug make %{?_smp_mflags} %install @@ -74,11 +74,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lftp/%{version}/proto-ftp.so %{_libdir}/lftp/%{version}/proto-http.so %{_libdir}/lftp/%{version}/proto-sftp.so -%{_libdir}/lftp/%{version}/liblftp-getdate.so %{_libdir}/liblftp-jobs.so.* %{_libdir}/liblftp-tasks.so.* %changelog +* Mon Sep 29 2008 Jiri Skala - 3.7.4-1 +- Resolves: #464420 re-base to 3.7.4 +- replaced usage of OpenSSL by GNUTLS due to license conflict + * Wed Apr 23 2008 Martin Nagy - 3.7.1-1 - update to upstream version 3.7.1 diff --git a/sources b/sources index 2697bac..7043baf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90ac5ab438ac1d9f7450b44ca6a7bd97 lftp-3.7.1.tar.gz +628381272905a26165d90d3630b07c7c lftp-3.7.4.tar.gz