Hello community,

here is the log from the commit of package lftp for openSUSE:Factory checked in 
at 2017-06-01 16:31:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lftp (Old)
 and      /work/SRC/openSUSE:Factory/.lftp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "lftp"

Thu Jun  1 16:31:57 2017 rev:67 rq:496481 version:4.7.7

Changes:
--------
--- /work/SRC/openSUSE:Factory/lftp/lftp.changes        2017-03-20 
17:08:56.203174320 +0100
+++ /work/SRC/openSUSE:Factory/.lftp.new/lftp.changes   2017-06-01 
16:32:00.781227418 +0200
@@ -1,0 +2,19 @@
+Wed Apr 26 09:07:46 UTC 2017 - [email protected]
+
+- Version update to 4.7.7:
+  * License has changed from GPL-2.0+ to GPL-3.0+
+  * Various small fixes all around
+- Remove all internal patches, if the ftp compat is needed we need
+  to upstream it on github:
+  * lftp-autoconf-req.patch
+  * lftp-compat-addfiles.patch
+  * lftp-completion.patch
+  * lftp-config_h.patch
+  * lftp-stdio.h.patch
+  * lftp-vi.1.1.tar.gz
+  * lftp-wrapper+edit+compat-modify.patch
+- Pass all the configure arguments to ensure nothing gets automagically
+  disabled
+- Remove unused dependencies
+
+-------------------------------------------------------------------

Old:
----
  lftp-4.7.4.tar.xz
  lftp-4.7.4.tar.xz.asc
  lftp-autoconf-req.patch
  lftp-compat-addfiles.patch
  lftp-completion.patch
  lftp-config_h.patch
  lftp-rpmlintrc
  lftp-stdio.h.patch
  lftp-vi.1.1.tar.gz
  lftp-wrapper+edit+compat-modify.patch
  lftp.png

New:
----
  lftp-4.7.7.tar.xz
  lftp-4.7.7.tar.xz.asc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lftp.spec ++++++
--- /var/tmp/diff_new_pack.KCA9Px/_old  2017-06-01 16:32:02.984916550 +0200
+++ /var/tmp/diff_new_pack.KCA9Px/_new  2017-06-01 16:32:02.988915986 +0200
@@ -19,34 +19,18 @@
 
 %define vi_version 1.1
 Name:           lftp
-Version:        4.7.4
+Version:        4.7.7
 Release:        0
 Summary:        Command Line File Transfer Program
-License:        GPL-2.0+
+License:        GPL-3.0+
 Group:          Productivity/Networking/Ftp/Clients
 Url:            http://lftp.yar.ru/
 Source:         http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
-# Formely: http://michael.stapelberg.de/lftp_vi/
-Source2:        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
-Source99:       lftp-rpmlintrc
-Patch1:         lftp-compat-addfiles.patch
-Patch2:         lftp-wrapper+edit+compat-modify.patch
-Patch4:         lftp-autoconf-req.patch
-Patch6:         lftp-completion.patch
-Patch7:         lftp-stdio.h.patch
-# PATCH-FIX-UPSTREAM -- Include config.h where needed.
-Patch9:         lftp-config_h.patch
+Source2:        
http://lav.yar.ru/[email protected]#/%name.keyring
+Source3:        http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz.asc
 # PATCH-FEATURE-OPENSUSE lftp-ssl-cipher.patch [email protected] -- use stronger 
cipher [bnc#857148]
-Patch10:        lftp-default-ssl-cipher.patch
-BuildRequires:  autoconf
-BuildRequires:  automake
+Patch0:         lftp-default-ssl-cipher.patch
 BuildRequires:  gcc-c++
-BuildRequires:  gzip
-BuildRequires:  libexpat-devel
-BuildRequires:  libidn-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
 BuildRequires:  make
@@ -54,16 +38,10 @@
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
-BuildRequires:  tar
-BuildRequires:  update-alternatives
-BuildRequires:  xz
-BuildRequires:  zlib-devel
-Requires:       %{_bindir}/less
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
-Conflicts:      ftp
-Obsoletes:      lftp-beta < %{version}
-Provides:       lftp-beta = %{version}-%{release}
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(libidn)
+BuildRequires:  pkgconfig(zlib)
+Requires:       less
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -83,26 +61,12 @@
 
 %prep
 %setup -q
-pushd src
-tar xzf "%{SOURCE2}"
-popd
-%patch1
-%patch2
-%patch4
-pushd src
-%patch6
-popd #src
-%patch7 -p1
-%patch9 -p1
-%patch10 -p1
+%autopatch -p1
 
 %build
-autoreconf -fi
-CFLAGS="-DUSE_VARARGS -DPREFER_STDARGS %{optflags} -fstack-protector"
-CFLAGS="$CFLAGS" \
-CXXFLAGS="$CFLAGS" \
-LDFLAGS=' ' \
 %configure \
+   --disable-silent-rules \
+   --without-included-regex \
    --disable-static \
    --with-modules \
    --without-gnutls \
@@ -111,60 +75,35 @@
    --without-profiling \
    --enable-largefile \
    --with-pager=%{_bindir}/less \
-   --with-libresolv
-
-make %{?_smp_mflags} STRIP=touch
+   --with-libresol \
+   --with-zlibv \
+   --with-libidn \
+   --with-expat
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install STRIP=touch MKDIR_P="mkdir -p"
-
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-%if 0%{?suse_version} <= 1310
-touch %{buildroot}%{_sysconfdir}/alternatives/ftp
-touch %{buildroot}%{_sysconfdir}/alternatives/ftp.1.gz
-%endif
-ln -sf %{_sysconfdir}/alternatives/ftp %{buildroot}%{_bindir}/ftp
-ln -sf %{_sysconfdir}/alternatives/ftp.1.gz 
%{buildroot}%{_mandir}/man1/ftp.1.gz
+%make_install
 
 # 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}
 
-%post
-/sbin/ldconfig
-
-update-alternatives --install %{_bindir}/ftp ftp %{_bindir}/%{name}_wrapper 5 \
-  --slave %{_mandir}/man1/ftp.1.gz ftp.1 %{_mandir}/man1/%{name}.1.gz
-
-%postun
-/sbin/ldconfig
-
-if [ "$1" = 0 ] ; then
-  update-alternatives --remove ftp %{_bindir}/%{name}_wrapper
-fi
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files -f "lftp.lang"
 %defattr(-,root,root)
 %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO
-%ghost %{_sysconfdir}/alternatives/ftp
-%ghost %{_sysconfdir}/alternatives/ftp.1.gz
-%{_bindir}/ftp
-%{_mandir}/man1/ftp.1%{ext_man}
 %config %{_sysconfdir}/lftp.conf
 %{_bindir}/lftp
 %{_bindir}/lftpget
-%{_bindir}/lftp_wrapper
 %{_datadir}/lftp
 %dir %{_libdir}/lftp
 %dir %{_libdir}/lftp/%{version}
-%{_libdir}/lftp/%{version}/cmd-edit.so
 %{_libdir}/lftp/%{version}/cmd-mirror.so
 %{_libdir}/lftp/%{version}/cmd-sleep.so
 %{_libdir}/lftp/%{version}/cmd-torrent.so
-%{_libdir}/lftp/%{version}/compat-mode.so
 %{_libdir}/lftp/%{version}/liblftp-network.so
 %{_libdir}/lftp/%{version}/liblftp-pty.so
 %{_libdir}/lftp/%{version}/proto-file.so
@@ -177,6 +116,5 @@
 %{_mandir}/man1/lftp.1%{ext_man}
 %{_mandir}/man1/lftpget.1%{ext_man}
 %{_mandir}/man5/lftp.conf.5%{ext_man}
-%{_datadir}/pixmaps/%{name}.png
 
 %changelog

++++++ lftp-4.7.4.tar.xz -> lftp-4.7.7.tar.xz ++++++
++++ 46335 lines of diff (skipped)



Reply via email to