X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lftp.spec;h=bab51fc99493bbae702d59ecb5353ec49c9cdcde;hb=9d3763af70ecc9a48034885979743d1f34fa44bc;hp=880b6f9a566b8c277fde49a65485274d789182c6;hpb=b866487001beece0740ace57cd213191b63528bb;p=packages%2Flftp.git

diff --git a/lftp.spec b/lftp.spec
index 880b6f9..bab51fc 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -4,7 +4,11 @@
 # Conditional build:
 %bcond_without	ssl	# do not use SSL
 %bcond_with	gnutls	# use gnutls, otherwise openssl is used when ssl is on
-
+# better just preload it instead forcing linking
+%bcond_with	dante	# Dante-based SOCKS support
+# broken currently https://www.dnssec-tools.org/trac/ticket/173
+%bcond_with	dnssec	# DNSSEC local validation
+#
 %if %{with ssl}
 %define with_openssl 1
 %endif
@@ -19,25 +23,30 @@ Summary(pl.UTF-8):	Zaawansowany klient FTP/HTTP
 Summary(pt_BR.UTF-8):	Sofisticado programa de transferência de arquivos (cliente FTP/HTTP)
 Summary(zh_CN.UTF-8):	lftp 客户端程序
 Name:		lftp
-Version:	4.0.10
+Version:	4.6.3a
 Release:	1
 License:	GPL v3+
 Group:		Applications/Networking
-Source0:	http://ftp.yars.free.net/pub/source/lftp/%{name}-%{version}.tar.xz
-# Source0-md5:	3dfd4458e1a72803821de468b77ae536
+Source0:	http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
+# Source0-md5:	b469ccc40d624aa4fdc66c1674b916d0
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5:	cdad8fb5342eebd9916eccefc98a855b
 Source2:	%{name}.desktop
 Source3:	%{name}-icon.png
-Patch0:		%{name}-home_etc.patch
-Patch1:		%{name}-makefile.patch
-# ALWAYS send updated patch to lftp mailing lists
-Patch2:		%{name}-pl.po-update.patch
-Patch3:		%{name}-m4.patch
+Patch100:	%{name}-git.patch
+Patch0:		%{name}-makefile.patch
+Patch1:		%{name}-m4.patch
+Patch2:		aliases.patch
+# when updated attach at https://github.com/lavv17/lftp/issues
+Patch3:		%{name}-pl.po-update.patch
+Patch4:		%{name}-am.patch
 URL:		http://lftp.yar.ru/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
-BuildRequires:	gettext-devel >= 0.14.2
+%{?with_dante:BuildRequires:	dante-devel}
+%{?with_dnssec:BuildRequires:	dnssec-tools-devel}
+BuildRequires:	expat-devel
+BuildRequires:	gettext-tools >= 0.14.2
 %{?with_gnutls:BuildRequires:	gnutls-devel >= 1.2.5}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 1:1.4.2-9
@@ -45,6 +54,8 @@ BuildRequires:	ncurses-devel >= 5.2
 %{?with_openssl:BuildRequires:	openssl-devel >= 0.9.7d}
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel >= 4.2
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_gcc_ver	%(%{__cc} -dumpversion | cut -b 1)
@@ -80,12 +91,14 @@ o arquivo FEATURES para uma lista mais detalhada.
 
 %prep
 %setup -q
-#%%patch0 -p1
+#%patch100 -p1
+%patch0 -p1
 %patch1 -p1
-#%patch2 -p1
-%patch3 -p1
+%patch2 -p1
+#%patch3 -p1
+%patch4 -p1
 
-rm -f po/stamp-po
+%{__rm} po/stamp-po
 
 %{!?with_gnutls:echo 'AC_DEFUN([AM_PATH_LIBGNUTLS],[/bin/true])' > m4/gnutls.m4}
 
@@ -97,7 +110,10 @@ rm -f po/stamp-po
 %{__automake}
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
 %configure \
+	--without-included-regex \
+	--with-dnssec-local-validation%{!?with_dnssec:=no} \
 	--with-modules \
+	--with-socksdante%{!?with_dante:=no} \
 	--with%{!?with_openssl:out}-openssl \
 	--with%{!?with_gnutls:out}-gnutls
 
@@ -106,17 +122,16 @@ CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_pixmapsdir},%{_desktopdir}}
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install lftp.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}/lftp.png
+cp -p lftp.conf $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}/lftp.png
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT%{_mandir}/{README.lftp-man-pages,lftpget.diff}
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,so}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{README.lftp-man-pages,lftpget.diff}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.{la,so}
 
 %find_lang %{name}