- up to 5.11.0; rediff patch

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 4bf4f77bc468592042d60aaeef2063fda7367357..e6d16a8215edae15ae04a0ad287b0bcece67cdb4 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -5,31 +5,38 @@
 Summary:       Tools for the XFS filesystem
 Summary(pl.UTF-8):     Narzędzia do systemu plików XFS
 Name:          xfsprogs
-Version:       4.19.0
-Release:       2
+Version:       5.11.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.gz
-# Source0-md5: 955b3dad9cbe01d6b21a562cc0100e04
+Source0:       https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
+# Source0-md5: 803bcddd983803b339acfb76064dfd84
 Source1:       xfs_lsprojid
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-pl.po-update.patch
-Patch2:                xfsprogs-small_fixes.patch
-# Patch1-md5:  28832d2c0aefb92ec17ebfe924c156e3
-URL:           http://www.xfs.org/
+# Patch1-md5:  1b41527cf19426d6059615c7d82b71e8
+URL:           https://xfs.wiki.kernel.org/
+# for <attr/attributes.h>
+BuildRequires: attr-devel
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: bash
+BuildRequires: device-mapper-devel
 BuildRequires: gettext-tools
 BuildRequires: glibc-static
+BuildRequires: inih-devel
 BuildRequires: libblkid-devel
+# without .la file so that -static-libtool-libs won't take libedit.a
+BuildRequires: libedit-devel >= 3.1-1.20191231.1
+BuildRequires: libicu-devel
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: libuuid-static
-BuildRequires: readline-devel
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.402
 BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Obsoletes:     xfsprogs-initrd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -109,7 +116,6 @@ Biblioteki statyczne do XFS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scrub/xfs_scrub_all.in tools/xfsbuflock.py
 
@@ -119,10 +125,12 @@ Biblioteki statyczne do XFS.
 %configure \
        DEBUG="%{?with_debug_asserts:-DDEBUG}%{!?with_debug_asserts:-DNDEBUG}" \
        OPTIMIZER="%{rpmcflags}" \
-       --enable-lto=no \
        --enable-blkid \
+       --enable-editline \
        --enable-gettext \
-       --enable-readline
+       --enable-libicu \
+       --disable-lto \
+       --enable-scrub=yes
 
 %{__make} -j1 \
        V=1
@@ -181,6 +189,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /sbin/mkfs.xfs
 %attr(755,root,root) /sbin/xfs_repair
 %attr(755,root,root) %{_sbindir}/xfs_*
+%exclude %{_sbindir}/xfs_scrub*
 %attr(755,root,root) /%{_lib}/libhandle.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libhandle.so.1
 %dir %{_libdir}/%{name}
@@ -195,8 +204,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files scrub
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/xfs_scrub
-%attr(755,root,root) /sbin/xfs_scrub_all
+%attr(755,root,root) %{_sbindir}/xfs_scrub
+%attr(755,root,root) %{_sbindir}/xfs_scrub_all
 %{systemdunitdir}/xfs_scrub@.service
 %{systemdunitdir}/xfs_scrub_all.service
 %{systemdunitdir}/xfs_scrub_all.timer
@@ -210,7 +219,23 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libhandle.so
 %{_libdir}/libhandle.la
 %{_includedir}/xfs
+%{_mandir}/man2/ioctl_xfs_ag_geometry.2*
+%{_mandir}/man2/ioctl_xfs_bulkstat.2*
+%{_mandir}/man2/ioctl_xfs_fsbulkstat.2*
+%{_mandir}/man2/ioctl_xfs_fscounts.2*
+%{_mandir}/man2/ioctl_xfs_fsgeometry.2*
+%{_mandir}/man2/ioctl_xfs_fsgetxattr.2*
+%{_mandir}/man2/ioctl_xfs_fsgetxattra.2*
+%{_mandir}/man2/ioctl_xfs_fsinumbers.2*
+%{_mandir}/man2/ioctl_xfs_fssetxattr.2*
+%{_mandir}/man2/ioctl_xfs_getbmap.2*
+%{_mandir}/man2/ioctl_xfs_getbmapa.2*
+%{_mandir}/man2/ioctl_xfs_getbmapx.2*
+%{_mandir}/man2/ioctl_xfs_getresblks.2*
+%{_mandir}/man2/ioctl_xfs_goingdown.2*
+%{_mandir}/man2/ioctl_xfs_inumbers.2*
 %{_mandir}/man2/ioctl_xfs_scrub_metadata.2*
+%{_mandir}/man2/ioctl_xfs_setresblks.2*
 %{_mandir}/man3/*handle.3*
 %{_mandir}/man3/xfsctl.3*