[packages/e2fsprogs] fix build with gettext >= 0.24.1

atler atler at pld-linux.org
Thu Jul 10 00:59:24 CEST 2025


commit 2de7ebb32f2798eeead310f9d23b25aa66d6cd21
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jul 10 00:57:00 2025 +0200

    fix build with gettext >= 0.24.1

 e2fsprogs.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 380f6fb..6ace8bc 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -73,7 +73,7 @@ BuildRequires:	libblkid-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpm >= 4.4.9-56
-BuildRequires:	rpmbuild(macros) >= 1.644
+BuildRequires:	rpmbuild(macros) >= 1.750
 BuildRequires:	texinfo
 BuildRequires:	texinfo-texi2dvi
 %if %{with allstatic}
@@ -127,6 +127,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		filterout_ld	-Wl,-z,relro
 %endif
 
+%define		gettext_ver	%(rpm -q --qf='%%{V}' gettext-tools 2> /dev/null || echo ERROR)
+
 %description
 The e2fsprogs package contains a number of utilities for creating,
 checking, modifying and correcting any inconsistencies in second
@@ -644,6 +646,11 @@ na potrzeby initrd.
 %patch -P1 -p1
 %patch -P2 -p1
 
+grep -q AM_GNU_GETTEXT configure.ac && ! grep -q AM_GNU_GETTEXT acinclude.m4
+%if %{_ver_ge %{gettext_ver} 0.24.1}
+	cat /usr/share/gettext/m4/*.m4 >> acinclude.m4
+%endif
+
 %build
 cp -f /usr/share/automake/config.sub .
 %{__gettextize}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/e2fsprogs.git/commitdiff/d4c9682b772248beac2147a651320019a33c1012



More information about the pld-cvs-commit mailing list