Accepting request 1298026 from network

- Re-download lftp-4.9.2-cdefs.patch. (forwarded request 1298025 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1298026
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lftp?expand=0&rev=83

lftp-4.9.2-cdefs.patch

@@ -1,13 +1,13 @@
 diff --git a/lib/libc-config.h.old b/lib/libc-config.h
-index 1300c3a..7537bab 100644
+index 33bdb73..000850c 100644
 --- a/lib/libc-config.h.old
 +++ b/lib/libc-config.h
-@@ -156,7 +156,7 @@
- #undef __warndecl
+@@ -179,7 +179,7 @@
+ # endif
  
  /* Include our copy of glibc <sys/cdefs.h>.  */
--#include <cdefs.h>
+-# include <cdefs.h>
 +#include <sys/cdefs.h>
  
  /* <cdefs.h> __inline is too pessimistic for non-GCC.  */
- #undef __inline
+ # undef __inline

lftp.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Aug  6 19:14:11 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Re-download lftp-4.9.2-cdefs.patch.
+
+-------------------------------------------------------------------
+Wed Aug  6 13:11:24 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Drop usage of deprectated desktop_file_update.
+- Generate a po/LINGUAS file: gettext 0.25.x dropped the deprecated
+  ALL_LINGUAS variable, but the entire build script is so legacy,
+  that just working around with the still supported po/LINGUAS is
+  the easiest for now.
+- BuildRequire gettext nstead of gettext-tools: allow OBS to
+  shortcut through the gettext mini flavors.
+
 -------------------------------------------------------------------
 Mon May  5 19:14:02 UTC 2025 - Peter Simons <psimons@suse.com>
 

lftp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lftp
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -41,7 +41,7 @@ Patch100:       https://src.fedoraproject.org/rpms/lftp/raw/rawhide/f/lftp-4.9.2
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
-BuildRequires:  gettext-tools
+BuildRequires:  gettext
 BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
 BuildRequires:  make
@@ -50,7 +50,6 @@ BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  update-alternatives
-BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(libidn2)
 BuildRequires:  pkgconfig(zlib)
@@ -87,6 +86,8 @@ HTTP and FTP, and FXP transfers.
 # that we apply above.
 gettextize --force --copy --no-changelog
 autoreconf --install --force
+# with gettext >= 0.25, the logic to rely on ALL_LINGUAS is not working reliably
+(cd po && ls *.po | sed 's/\.po$//' > LINGUAS)
 %configure \
    --disable-silent-rules \
    --without-included-regex \
@@ -106,7 +107,6 @@ make %{?_smp_mflags}
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-%suse_update_desktop_file %{name} -G "FTP client" Network FileTransfer
 %find_lang %{name}
 
 %post -p /sbin/ldconfig