From 2607c7928d23f6dfb5ed2fa307688beead73cbb8 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 27 Jun 2023 17:22:30 -0400 Subject: [PATCH] Fix build with gettext-0.22 gettext-0.22 raises an error on what is clearly an typo in the translation: de.po:3087: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. --- 0001-po-fix-German-translation.patch | 32 ++++++++++++++++++++++++++++ xfsprogs.spec | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 0001-po-fix-German-translation.patch diff --git a/0001-po-fix-German-translation.patch b/0001-po-fix-German-translation.patch new file mode 100644 index 0000000..f84f859 --- /dev/null +++ b/0001-po-fix-German-translation.patch @@ -0,0 +1,32 @@ +From 98c91a879c0862ad7c80bda55bb482dc01c56e75 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Tue, 27 Jun 2023 17:01:43 -0400 +Subject: [PATCH] po: fix German translation + +gettext-0.22 raises an error on what is clearly an typo in the translation: + + de.po:3087: 'msgstr' is not a valid C format string, unlike 'msgid'. + Reason: In the directive number 2, the argument size specifier is invalid. + +Signed-off-by: Yaakov Selkowitz +Reviewed-by: Darrick J. Wong +--- + po/de.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/de.po b/po/de.po +index 944b0e91..a6f8fde1 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -3084,7 +3084,7 @@ msgstr "%llu Spezialdateien\n" + #: .././estimate/xfs_estimate.c:191 + #, c-format + msgid "%s will take about %.1f megabytes\n" +-msgstr "%s wird etwa %.lf Megabytes einnehmen\n" ++msgstr "%s wird etwa %.1f Megabytes einnehmen\n" + + #: .././estimate/xfs_estimate.c:198 + #, c-format +-- +2.41.0 + diff --git a/xfsprogs.spec b/xfsprogs.spec index 6d44587..c05114d 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -7,6 +7,8 @@ URL: https://xfs.wiki.kernel.org Source0: http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz Source1: http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.sign Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/13F703E6C11CF6F0.asc +# Fix German translation with gettext-0.22 +Patch0: 0001-po-fix-German-translation.patch BuildRequires: make BuildRequires: gcc BuildRequires: libtool, gettext, libattr-devel, libuuid-devel