From b724cd56b8a7624f5707ba45a18c587f8e6fbc1f Mon Sep 17 00:00:00 2001 From: wguanghao Date: Wed, 19 Jul 2023 14:45:38 +0800 Subject: [PATCH] fix compile failure --- 0002-po-fix-German-translation.patch | 32 ++++++++++++++++++++++++++++ xfsprogs.spec | 6 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0002-po-fix-German-translation.patch diff --git a/0002-po-fix-German-translation.patch b/0002-po-fix-German-translation.patch new file mode 100644 index 0000000..dc20b83 --- /dev/null +++ b/0002-po-fix-German-translation.patch @@ -0,0 +1,32 @@ +From 0fc0d398f32bf751c4d6da3b5609c962310a75d7 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Tue, 27 Jun 2023 17:29:31 -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 944b0e9..a6f8fde 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 7075d4f..654587e 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,6 +1,6 @@ Name: xfsprogs Version: 6.1.1 -Release: 2 +Release: 3 Summary: Administration and debugging tools for the XFS file system License: GPL+ and LGPLv2+ URL: https://xfs.wiki.kernel.org @@ -20,6 +20,7 @@ Conflicts: xfsdump < 3.0.1 Patch0: xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch Patch1: 0001-xfsprogs-Add-sw64-architecture.patch +Patch2: 0002-po-fix-German-translation.patch %description xfsprogs are the userspace utilities that manage XFS filesystems. @@ -104,6 +105,9 @@ rm -rf %{buildroot}%{_datadir}/doc/xfsprogs/ %changelog +* Wed Jul 19 2023 wuguanghao - 6.1.1-3 +- fix compile failure + * Fri Apr 28 2023 Zhiqiang Liu - 6.1.1-2 - readline has been removed by bbe12eb9a0f9 (xfsprogs: remove libreadline support), we can use --enable-editline=yes to enable similar functions.