Hello community,
here is the log from the commit of package lftp for openSUSE:Factory checked in
at 2014-11-04 17:28:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-06
16:57:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lftp.new/lftp.changes 2014-11-04
17:28:26.000000000 +0100
@@ -1,0 +2,27 @@
+Mon Nov 3 10:49:12 UTC 2014 - tchva...@suse.com
+
+- Fix the update-alternatives to be up-par
+
+-------------------------------------------------------------------
+Mon Nov 3 10:41:56 UTC 2014 - tchva...@suse.com
+
+- Fully remove sle10 support.
+
+-------------------------------------------------------------------
+Mon Nov 3 10:38:19 UTC 2014 - tchva...@suse.com
+
+- Version bump to lftp 4.6.0:
+ * new torrent --share option.
+ * new setting mirror:require-source.
+ * new settings xfer:use-temp-file and xfer:temp-file-name.
+ * ftp: wait for QUIT reply before closing control socket.
+ * display valid IDN in URLs without percent encoding.
+ * ftp: shutdown SSL connection before closing control socket.
+ * ftp: avoid duplication of PROT command.
+ * fixed debug -o to append to the log file.
+ * fixed compilation without SSL.
+ * http: don't uncompress files ending with .gz, .Z or .tgz
+ * http: fixed inflation of some files.
+ * minor fixes in torrent protocol.
+
+-------------------------------------------------------------------
Old:
----
lftp-4.5.5.tar.xz
lftp-4.5.5.tar.xz.asc
New:
----
lftp-4.6.0.tar.xz
lftp-4.6.0.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lftp.spec ++++++
--- /var/tmp/diff_new_pack.s69KIl/_old 2014-11-04 17:28:28.000000000 +0100
+++ /var/tmp/diff_new_pack.s69KIl/_new 2014-11-04 17:28:28.000000000 +0100
@@ -18,20 +18,16 @@
%define vi_version 1.1
-%if 0%{?suse_version} >= 1100
-%define with_gnutls 1
-%else
-%define with_openssl 1
-%endif
Name: lftp
-Version: 4.5.5
+Version: 4.6.0
Release: 0
Summary: 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
-Source2:
http://michael.stapelberg.de/lftp_vi/lftp-vi.%{vi_version}.tar.gz
+# Formely: http://michael.stapelberg.de/lftp_vi/
+Source2: lftp-vi.%{vi_version}.tar.gz
Source3: lftp.png
Source4:
http://lav.yar.ru/l...@yars.free.net-gpg-public-key#/%name.keyring
Source5: http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz.asc
@@ -39,7 +35,7 @@
Patch1: lftp-compat-addfiles.patch
Patch2: lftp-wrapper+edit+compat-modify.patch
Patch4: lftp-autoconf-req.patch
-Patch6: http://michael.stapelberg.de/lftp_vi/lftp-completion.patch
+Patch6: lftp-completion.patch
Patch7: lftp-stdio.h.patch
# PATCH-FEATURE-OPENSUSE lftp-ca-bundle-path.patch dims...@opensuse.org -- Use
/etc/ssl/ca-bundle.pem as root CA store.
Patch8: lftp-ca-bundle-path.patch
@@ -51,6 +47,7 @@
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: gzip
+BuildRequires: libgnutls-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: make
@@ -62,21 +59,11 @@
BuildRequires: update-alternatives
BuildRequires: xz
Requires: %{_bindir}/less
-# FIXME: use proper Requires(pre/post/preun/...)
-PreReq: /bin/rm
-# FIXME: use proper Requires(pre/post/preun/...)
-PreReq: update-alternatives
+Requires(post): 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
%description
LFTP is a reliable shell-like command line FTP client. It can retry
@@ -109,39 +96,15 @@
%patch9 -p1
%patch10
-# 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 '
-s|AC_CHECK_FUNCS_ONCE|AC_CHECK_FUNCS|g
-;
-s|AC_CHECK_HEADERS_ONCE|AC_CHECK_HEADERS|g
-;
-s|AC_CHECK_DECLS_ONCE|AC_CHECK_DECLS|g
-' m4/*.m4
-%endif
-
%build
autoreconf -fi
-
-%if 0%{?suse_version:1} && 0%{?suse_version} >= 1010
CFLAGS="-DUSE_VARARGS -DPREFER_STDARGS %{optflags} -fstack-protector"
-%else
-CFLAGS="-DUSE_VARARGS -DPREFER_STDARGS %{optflags}"
-%endif
CFLAGS="$CFLAGS" \
CXXFLAGS="$CFLAGS" \
LDFLAGS=' ' \
%configure \
- gl_cv_func_printf_directive_n=yes \
- gl_cv_func_printf_infinite_long_double=yes \
--with-modules \
-%if %{?with_gnutls:1}0
--with-gnutls --without-openssl \
-%endif
-%if %{?with_openssl:1}0
- --with-openssl --without-gnutls \
-%endif
--with-modules \
--with-debug \
--without-profiling \
@@ -149,39 +112,45 @@
--with-pager=%{_bindir}/less \
--with-libresolv
-make %{?_smp_mflags} \
- STRIP=touch
+make %{?_smp_mflags} STRIP=touch
%install
-%{makeinstall} STRIP=touch
+make DESTDIR=%{buildroot} install STRIP=touch
-touch "%{buildroot}%{_bindir}/ftp"
-chmod 0755 "%{buildroot}%{_bindir}/ftp"
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}%{_sysconfdir}/alternatives/ftp
+ln -sf %{_sysconfdir}/alternatives/ftp %{buildroot}%{_bindir}/ftp
+touch %{buildroot}%{_sysconfdir}/alternatives/ftp.1.gz
+ln -sf %{_sysconfdir}/alternatives/ftp.1.gz
%{buildroot}%{_mandir}/man1/ftp.1.gz
# We don't package the .la files
find %{buildroot} -type f -name "*.la" -delete -print
install -D -m 0644 "%{SOURCE3}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png"
-%find_lang "%{name}"
+%find_lang %{name}
%post
/sbin/ldconfig
-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}"
-%{_sbindir}/update-alternatives --auto ftp
+
+update-alternatives --install %{_bindir}/ftp ftp %{_bindir}/%{name}_wrapper 5
\
+ --slave %{_mandir}/man1/ftp.1.gz ftp.1 %{_mandir}/man1/%{name}.1.gz
+update-alternatives --auto ftp
%postun -p /sbin/ldconfig
%preun
if [ $1 -eq 0 ]; then
- %{_sbindir}/update-alternatives --remove ftp "%{_bindir}/lftp_wrapper"
+ update-alternatives --remove ftp %{_bindir}/%{name}_wrapper
fi
%files -f "lftp.lang"
%defattr(-,root,root)
%doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO lftp.lsm
+%ghost %{_sysconfdir}/alternatives/ftp
+%ghost %{_sysconfdir}/alternatives/ftp.1.gz
+%{_bindir}/ftp
+%{_mandir}/man1/ftp.1.gz
%config %{_sysconfdir}/lftp.conf
%{_bindir}/lftp
%{_bindir}/lftpget
@@ -207,9 +176,5 @@
%doc %{_mandir}/man1/lftpget.1%{ext_man}
%doc %{_mandir}/man5/lftp.conf.5%{ext_man}
%{_datadir}/pixmaps/%{name}.png
-%ghost %{_bindir}/ftp
-%if 0%{?suse_version} > 1110
-%ghost %doc %attr(0444,root,root) %{_mandir}/man1/ftp.1%{ext_man}
-%endif
%changelog
++++++ lftp-4.5.5.tar.xz -> lftp-4.6.0.tar.xz ++++++
++++ 15613 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
