Hello community, here is the log from the commit of package lftp for openSUSE:Factory checked in at 2014-05-11 16:35:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lftp (Old) and /work/SRC/openSUSE:Factory/.lftp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lftp" Changes: -------- --- /work/SRC/openSUSE:Factory/lftp/lftp.changes 2014-04-08 11:45:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lftp.new/lftp.changes 2014-05-11 16:36:00.000000000 +0200 @@ -1,0 +2,12 @@ +Sat May 10 18:41:59 UTC 2014 - [email protected] + +- ltfp 4.4.16: + * fixed mirror --loop to re-check base directory contents. + * fixed sftp and fish authentication by password with FreeBSD + server. + * fixed directory index parsing for some http servers. + * fixed find command output to avoid extra slash for plain files. + * fixed several bugs which could cause segfault. +- some spec cleanup + +------------------------------------------------------------------- Old: ---- lftp-4.4.15.tar.xz lftp-4.4.15.tar.xz.asc New: ---- lftp-4.4.16.tar.xz lftp-4.4.16.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lftp.spec ++++++ --- /var/tmp/diff_new_pack.g1JlDk/_old 2014-05-11 16:36:01.000000000 +0200 +++ /var/tmp/diff_new_pack.g1JlDk/_new 2014-05-11 16:36:01.000000000 +0200 @@ -17,26 +17,25 @@ # -%if %suse_version >= 1100 +%define vi_version 1.1 +%if 0%{?suse_version} >= 1100 %define with_gnutls 1 %else %define with_openssl 1 %endif - Name: lftp -Version: 4.4.15 +Version: 4.4.16 Release: 0 -%define vi_version 1.1 -Url: http://lftp.yar.ru/ Summary: LFTP Command Line File Transfer Program License: GPL-2.0+ Group: Productivity/Networking/Ftp/Clients +Url: http://lftp.yar.ru/ Source: http://lftp.yar.ru/ftp/lftp-%{version}.tar.xz Source1: lftp.desktop Source2: http://michael.stapelberg.de/lftp_vi/lftp-vi.%{vi_version}.tar.gz Source3: lftp.png Source4: http://lav.yar.ru/[email protected]#/%name.keyring -Source5: http://lftp.yar.ru/ftp/%name-%{version}.tar.xz.asc +Source5: http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz.asc Source99: lftp-rpmlintrc Patch1: lftp-compat-addfiles.patch Patch2: lftp-wrapper+edit+compat-modify.patch @@ -47,7 +46,6 @@ Patch8: lftp-ca-bundle-path.patch # PATCH-FIX-UPSTREAM -- Include config.h where needed. Patch9: lftp-config_h.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -63,22 +61,22 @@ BuildRequires: update-alternatives BuildRequires: update-desktop-files BuildRequires: xz -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif +Requires: %{_bindir}/less +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: /bin/rm +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: update-alternatives +Obsoletes: lftp-beta < %{version} +Provides: lftp-beta = %{version}-%{release} +Provides: nkitb:%{_bindir}/ftp +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: ftp %if %{?with_gnutls:1}0 BuildRequires: libgnutls-devel %endif %if %{?with_openssl:1}0 BuildRequires: openssl-devel %endif -Obsoletes: lftp-beta < %{version} -Provides: lftp-beta = %{version}-%{release} -Conflicts: ftp -Provides: nkitb:/usr/bin/ftp -PreReq: update-alternatives -PreReq: /bin/rm -Requires: /usr/bin/less %description LFTP is a reliable shell-like command line FTP client. It can retry @@ -96,10 +94,9 @@ HTTP and FTP, and FXP transfers. %prep -%{?gpg_verify: %gpg_verify %{S:5}} %setup -q pushd src -%__tar xzf "%{SOURCE2}" +tar xzf "%{SOURCE2}" popd %patch1 %patch2 @@ -114,7 +111,7 @@ # replace AC_CHECK_FUNCS_ONCE with AC_CHECK_FUNCS on SLE 9+10 # as they're not supported by the autotools environment there: %if 0%{?suse_version} > 0 && 0%{?suse_version} < 1020 -%__sed -i ' +sed -i ' s|AC_CHECK_FUNCS_ONCE|AC_CHECK_FUNCS|g ; s|AC_CHECK_HEADERS_ONCE|AC_CHECK_HEADERS|g @@ -126,7 +123,7 @@ %build autoreconf -fi -%if 0%{?suse_version:1} && %suse_version >= 1010 +%if 0%{?suse_version:1} && 0%{?suse_version} >= 1010 CFLAGS="-DUSE_VARARGS -DPREFER_STDARGS %{optflags} -fstack-protector" %else CFLAGS="-DUSE_VARARGS -DPREFER_STDARGS %{optflags}" @@ -148,39 +145,39 @@ --with-debug \ --without-profiling \ --enable-largefile \ - --with-pager=/usr/bin/less \ + --with-pager=%{_bindir}/less \ --with-libresolv -%__make %{?jobs:-j%jobs} \ +make %{?_smp_mflags} \ STRIP=touch %install -%makeinstall STRIP=touch +%{makeinstall} STRIP=touch touch "%{buildroot}%{_bindir}/ftp" -%__chmod 0755 "%{buildroot}%{_bindir}/ftp" +chmod 0755 "%{buildroot}%{_bindir}/ftp" # We don't package the .la files -%__rm -f "%{buildroot}/%{_libdir}"/{lftp/*/,}*.la +find %{buildroot} -type f -name "*.la" -delete -print -%__install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" -%__install -D -m 0644 "%{SOURCE3}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png" +install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" +install -D -m 0644 "%{SOURCE3}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png" %suse_update_desktop_file "%{name}" Network FileTransfer %find_lang "%{name}" %post /sbin/ldconfig -test -L "%{_bindir}/ftp" || %__rm -f "%{_bindir}/ftp" -/usr/sbin/update-alternatives --install "%{_bindir}/ftp" ftp "%{_bindir}/lftp_wrapper" 5 \ +test -L "%{_bindir}/ftp" || rm -f "%{_bindir}/ftp" +%{_sbindir}/update-alternatives --install "%{_bindir}/ftp" ftp "%{_bindir}/lftp_wrapper" 5 \ --slave "%{_mandir}/man1/ftp.1%{ext_man}" ftp.1 "%{_mandir}/man1/lftp.1%{ext_man}" -/usr/sbin/update-alternatives --auto ftp +%{_sbindir}/update-alternatives --auto ftp %postun -p /sbin/ldconfig %preun if [ $1 -eq 0 ]; then - /usr/sbin/update-alternatives --remove ftp "%{_bindir}/lftp_wrapper" + %{_sbindir}/update-alternatives --remove ftp "%{_bindir}/lftp_wrapper" fi %files -f "lftp.lang" @@ -217,7 +214,4 @@ %ghost %doc %attr(0444,root,root) %{_mandir}/man1/ftp.1%{ext_man} %endif -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - %changelog ++++++ lftp-4.4.15.tar.xz -> lftp-4.4.16.tar.xz ++++++ ++++ 2843 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
