- fix packaging when built without scrub

[packages/xfsprogs.git] / xfsprogs-miscfix-v2.patch

diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch
index b3859dc609cbccba0c26b2671134a19ef7ff81ad..3a4296b5c4b934c6dedcdf2458fc3e43346ac5dc 100644 (file)
--- a/xfsprogs-miscfix-v2.patch
+++ b/xfsprogs-miscfix-v2.patch
@@ -1,18 +1,28 @@
-diff -urN ./old/xfsprogs-1.3.5/configure.in xfsprogs-1.3.5/configure.in
---- ./old/xfsprogs-1.3.5/configure.in  Thu Aug  9 21:04:48 2001
-+++ xfsprogs-1.3.5/configure.in        Wed Aug 29 09:12:23 2001
-@@ -201,14 +201,6 @@
- dnl (usually on Debian, but not Redhat pre-7.0)
- pkg_man_dir=${prefix}/share/man
- have_zipped_manpages=false
--for d in ${prefix}/share/man ${prefix}/man ; do
--    if test -f $d/man1/man.1.gz
--    then
--      pkg_man_dir=$d
--      have_zipped_manpages=true
--      break
--    fi
--done
- AC_SUBST(pkg_man_dir)
- AC_SUBST(have_zipped_manpages)
+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
+-        if test -f $d/man1/man.1.gz
+-        then
+-            have_zipped_manpages=true
+-            break
+-        fi
+-    done
+     AC_SUBST(have_zipped_manpages)
+   ])