[packages/xfsprogs] Up to 6.14.0

arekm arekm at pld-linux.org
Wed Jun 18 15:01:38 CEST 2025


commit 522d987235c83ed854a53f3f991cc9b986f3c1fc
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Jun 18 14:18:46 2025 +0200

    Up to 6.14.0

 icu76.spec          |  9 ---------
 man-page-name.patch | 12 ------------
 xfsprogs.spec       | 15 ++++++---------
 3 files changed, 6 insertions(+), 30 deletions(-)
---
diff --git a/icu76.spec b/icu76.spec
deleted file mode 100644
index 0935227..0000000
--- a/icu76.spec
+++ /dev/null
@@ -1,9 +0,0 @@
---- xfsprogs-6.12.0/m4/package_icu.m4.orig	2024-11-21 12:56:04.000000000 +0100
-+++ xfsprogs-6.12.0/m4/package_icu.m4	2025-01-14 21:41:08.360037770 +0100
-@@ -1,5 +1,5 @@
- AC_DEFUN([AC_HAVE_LIBICU],
--  [ PKG_CHECK_MODULES([libicu], [icu-i18n], [have_libicu=yes], [have_libicu=no])
-+  [ PKG_CHECK_MODULES([libicu], [icu-i18n icu-uc], [have_libicu=yes], [have_libicu=no])
-     AC_SUBST(have_libicu)
-     AC_SUBST(libicu_CFLAGS)
-     AC_SUBST(libicu_LIBS)
diff --git a/xfsprogs.spec b/xfsprogs.spec
index b7da874..aeac94f 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -8,17 +8,15 @@
 Summary:	Tools for the XFS filesystem
 Summary(pl.UTF-8):	Narzędzia do systemu plików XFS
 Name:		xfsprogs
-Version:	6.12.0
-Release:	2
+Version:	6.14.0
+Release:	1
 License:	LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
-# Source0-md5:	c2f1ddf241f2ce7ea2669de595a4f766
+# Source0-md5:	339b90d4716d5f1e3e9d31f3c68f830d
 Source1:	xfs_lsprojid
 Patch0:		%{name}-miscfix-v2.patch
 Patch1:		%{name}-pl.po-update.patch
-Patch2:		man-page-name.patch
-Patch3:		icu76.spec
 URL:		https://xfs.wiki.kernel.org/
 # for <attr/attributes.h>
 BuildRequires:	attr-devel
@@ -124,8 +122,6 @@ Biblioteki statyczne do XFS.
 %prep
 %setup -q
 %patch -P 0 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
 
 # files order in pot changes in every version, making diff huge - sort entries first
 %{__mv} po/xfsprogs.pot po/xfsprogs.pot.upstream
@@ -133,9 +129,9 @@ msgcat -F po/xfsprogs.pot.upstream -o po/xfsprogs.pot
 # update line numbers etc.
 %{__mv} po/pl.po po/pl.po.upstream
 msgmerge po/pl.po.upstream po/xfsprogs.pot -o po/pl.po
-%patch -P 1 -p1 -b .orig
+#%%patch -P 1 -p1 -b .orig
 
-%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scrub/xfs_scrub_all.in tools/xfsbuflock.py
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' tools/git-contributors.py tools/xfsbuflock.py
 
 %build
 %{__aclocal} -I m4
@@ -275,6 +271,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man2/ioctl_xfs_getresblks.2*
 %{_mandir}/man2/ioctl_xfs_goingdown.2*
 %{_mandir}/man2/ioctl_xfs_inumbers.2*
+%{_mandir}/man2/ioctl_xfs_rtgroup_geometry.2*
 %{_mandir}/man2/ioctl_xfs_scrub_metadata.2*
 %{_mandir}/man2/ioctl_xfs_scrubv_metadata.2*
 %{_mandir}/man2/ioctl_xfs_setresblks.2*
diff --git a/man-page-name.patch b/man-page-name.patch
deleted file mode 100644
index 7ed90d8..0000000
--- a/man-page-name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xfsprogs-6.12.0/man/man2/ioctl_xfs_commit_range.2.orig	2024-12-02 22:18:19.000000000 +0100
-+++ xfsprogs-6.12.0/man/man2/ioctl_xfs_commit_range.2	2024-12-04 22:43:41.523326476 +0100
-@@ -22,8 +22,8 @@
- .\" %%%LICENSE_END
- .TH IOCTL-XFS-COMMIT-RANGE 2  2024-02-18 "XFS"
- .SH NAME
--ioctl_xfs_start_commit \- prepare to exchange the contents of two files
- ioctl_xfs_commit_range \- conditionally exchange the contents of parts of two files
-+ioctl_xfs_start_commit \- prepare to exchange the contents of two files
- .SH SYNOPSIS
- .br
- .B #include <sys/ioctl.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfsprogs.git/commitdiff/522d987235c83ed854a53f3f991cc9b986f3c1fc



More information about the pld-cvs-commit mailing list