rpms/xfsprogs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to upstream 6.4.0

Browse Source 
Drop downstream patch 0001-po-fix-German-translation.patch, replaced
by upstream patch:
	98737362 po: Fix invalid .de translation format string
which is contained in 6.4.0 release.

Resolves: rhbz#2223973
Signed-off-by: Pavel Reichl <preichl@redhat.com>
This commit is contained in:
Pavel Reichl 2023-08-08 10:00:26 +02:00
parent aaa365e0d5
commit bd0d4d33a7
4 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -77,3 +77,5 @@ xfsprogs-3.1.2.tar.gz
/xfsprogs-6.2.0.tar.xz
/xfsprogs-6.3.0.tar.sign
/xfsprogs-6.3.0.tar.xz
/xfsprogs-6.4.0.tar.sign
/xfsprogs-6.4.0.tar.xz

32
0001-po-fix-German-translation.patch
View File

@ -1,32 +0,0 @@
From 98c91a879c0862ad7c80bda55bb482dc01c56e75 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
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 <yselkowi@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
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

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (xfsprogs-6.3.0.tar.sign) = 55d25cba087ab3b34ac4ff6ee12267c56aab8391cb74c0f1fbba82930ab8061de04014c29fa3e2db2800fb5c943b3c3656e0db832e0ed5206c24fe1478890b13
SHA512 (xfsprogs-6.3.0.tar.xz) = dbb3e77d0d9cf184a0e647b8231350401a7549a23a0bfd9121cf2a1b48e85f71d98329dff440fc6e984bcecfdcc2a72f0f27c4989560f3c55359f21f3fb434bb
SHA512 (xfsprogs-6.4.0.tar.sign) = 7b3d48bc398d2962ac113f2f2804423cc8abfb3784ccee607945c19d89e34da629cc5b2b8c946af3d7b5839c6745cf20f1a72ddd2dea6e922c39d2ec9b7d6bc6
SHA512 (xfsprogs-6.4.0.tar.xz) = 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f

10
xfsprogs.spec
View File

@ -1,14 +1,13 @@
Summary: Utilities for managing the XFS filesystem
Name: xfsprogs
Version: 6.3.0
Release: 3%{?dist}
Version: 6.4.0
Release: 1%{?dist}
License: GPL+ and LGPLv2+
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
@ -127,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
%{_libdir}/*.so
%changelog
* Tue Aug 08 2023 Pavel Reichl <preichl@redhat.com> - 6.4.0-1
- New upstream release (#2223973)
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild