X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xfsprogs.spec;h=47da5a4777ca37b9b1bd1842e6d9a6a6cf2d4246;hb=8cf0c6cc4c2747ac0960b8650560177e0243b4ad;hp=985a57f3351bef7fcfff1f4e7b6d0add03640629;hpb=5c1edbef4210c4f70df78d7e3763ad285ae02dae;p=packages%2Fxfsprogs.git

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 985a57f..47da5a4 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -5,34 +5,41 @@
 Summary:	Tools for the XFS filesystem
 Summary(pl.UTF-8):	Narzędzia do systemu plików XFS
 Name:		xfsprogs
-Version:	4.20.0
-Release:	2
+Version:	5.16.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:	449e475ff861a184606c7d1500de7fb6
+Source0:	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
+# Source0-md5:	20446fd3e857d1568c0ead3e88453f86
 Source1:	xfs_lsprojid
 Patch0:		%{name}-miscfix-v2.patch
 Patch1:		%{name}-pl.po-update.patch
-# Patch1-md5:	5fa89df413162a272aadfb3bdfe2330d
-Patch2:		xfsprogs-small_fixes.patch
-URL:		http://www.xfs.org/
+# Patch1-md5:	f29644b0671aa76f1c994e6a9dec8eae
+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:	userspace-rcu-devel
+BuildRequires:	userspace-rcu-static
 BuildRequires:	sed >= 4.0
-Obsoletes:	xfsprogs-initrd
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Obsoletes:	xfsprogs-initrd < 3.1.11-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if "%{pld_release}" == "ac"
@@ -111,7 +118,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
 
@@ -121,14 +127,14 @@ Biblioteki statyczne do XFS.
 %configure \
 	DEBUG="%{?with_debug_asserts:-DDEBUG}%{!?with_debug_asserts:-DNDEBUG}" \
 	OPTIMIZER="%{rpmcflags}" \
-	--enable-libicu=yes \
-	--enable-lto=no \
 	--enable-blkid \
+	--enable-editline \
 	--enable-gettext \
-	--enable-readline \
+	--enable-libicu \
+	--disable-lto \
 	--enable-scrub=yes
 
-%{__make} -j1 \
+%{__make} \
 	V=1
 
 %install
@@ -188,6 +194,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sbindir}/xfs_scrub*
 %attr(755,root,root) /%{_lib}/libhandle.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libhandle.so.1
+%{_datadir}/%{name}
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/xfs_scrub_fail
 %{_mandir}/man5/projects.5*
@@ -215,7 +222,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*