From e3be1a5e3572c3d44daebf863db01ea21716886f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 14 Mar 2021 00:52:34 +0100 Subject: [PATCH] - up to 5.11.0; rediff patch --- xfsprogs-miscfix-v2.patch | 31 ++++++++++++++++--------------- xfsprogs.spec | 4 ++-- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch index 20d8f10..3a4296b 100644 --- a/xfsprogs-miscfix-v2.patch +++ b/xfsprogs-miscfix-v2.patch @@ -1,7 +1,20 @@ ---- xfsprogs-2.5.4/m4/manual_format.m4.orig 2003-07-25 19:42:03.000000000 +0200 -+++ xfsprogs-2.5.4/m4/manual_format.m4 2003-08-08 08:22:59.000000000 +0200 +diff -urNp -x '*.orig' xfsprogs-5.11.0.org/libxfs/Makefile xfsprogs-5.11.0/libxfs/Makefile +--- xfsprogs-5.11.0.org/libxfs/Makefile 2020-12-23 02:12:40.000000000 +0100 ++++ xfsprogs-5.11.0/libxfs/Makefile 2021-03-14 00:46:57.929250648 +0100 +@@ -110,7 +110,7 @@ CFILES = cache.c \ + + FCFLAGS = -I. + +-LTLIBS = $(LIBPTHREAD) $(LIBRT) ++LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID) + + # don't try linking xfs_repair with a debug libxfs. + DEBUG = -DNDEBUG +diff -urNp -x '*.orig' xfsprogs-5.11.0.org/m4/manual_format.m4 xfsprogs-5.11.0/m4/manual_format.m4 +--- xfsprogs-5.11.0.org/m4/manual_format.m4 2020-12-23 02:07:48.000000000 +0100 ++++ xfsprogs-5.11.0/m4/manual_format.m4 2021-03-14 00:46:57.929250648 +0100 @@ -6,12 +6,5 @@ - # + # AC_DEFUN([AC_MANUAL_FORMAT], [ have_zipped_manpages=false - for d in ${prefix}/share/man ${prefix}/man ; do @@ -13,15 +26,3 @@ - done AC_SUBST(have_zipped_manpages) ]) - ---- xfsprogs-3.2.0/libxfs/Makefile~ 2014-01-28 07:19:44.000000000 +0100 -+++ xfsprogs-3.2.0/libxfs/Makefile 2014-05-17 20:01:36.257560519 +0200 -@@ -56,7 +56,7 @@ - - FCFLAGS = -I. - --LTLIBS = $(LIBPTHREAD) $(LIBRT) -+LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID) - - # don't try linking xfs_repair with a debug libxfs. - DEBUG = -DNDEBUG diff --git a/xfsprogs.spec b/xfsprogs.spec index 1c244cb..e6d16a8 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -5,12 +5,12 @@ Summary: Tools for the XFS filesystem Summary(pl.UTF-8): Narzędzia do systemu plików XFS Name: xfsprogs -Version: 5.10.0 +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.xz -# Source0-md5: f4156af67a0e247833be88efaa2869f9 +# Source0-md5: 803bcddd983803b339acfb76064dfd84 Source1: xfs_lsprojid Patch0: %{name}-miscfix-v2.patch Patch1: %{name}-pl.po-update.patch -- 2.43.0