- rel 2

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

diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch
index b3859dc609cbccba0c26b2671134a19ef7ff81ad..dc1c2eef2a6902146590f3166f7402e836fcda4e 100644 (file)
--- a/xfsprogs-miscfix-v2.patch
+++ b/xfsprogs-miscfix-v2.patch
@@ -1,18 +1,43 @@
-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)
+--- 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
+@@ -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)
+   ])
+
+--- xfsprogs-3.1.3/Makefile~   2010-08-18 06:54:06.000000000 +0200
++++ xfsprogs-3.1.3/Makefile    2010-08-28 16:35:25.820731669 +0200
+@@ -39,7 +39,11 @@
+ LDIRT += $(SRCTAR)
+ endif
  
+-LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk
++LIB_SUBDIRS = libxfs libxlog libxcmd libhandle
++ifneq ($(ENABLE_BLKID), yes)
++LIB_SUBDIRS += libdisk
++endif
++
+ TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \
+               mdrestore repair rtcp m4 man doc po debian
+ 
+
+--- 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