- updated to 2.6.25, updated miscfix-v2,cflags patches

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

diff --git a/xfsprogs-miscfix.patch b/xfsprogs-miscfix.patch
index 9b7f31c769d8261d32d3fcdb69bf9ed204f3308e..b8eb15f2675654bf194d7785d2a6d648ec71f228 100644 (file)
--- a/xfsprogs-miscfix.patch
+++ b/xfsprogs-miscfix.patch
@@ -1,19 +1,7 @@
-diff -urN xfsprogs-1.2.0.org/configure.in xfsprogs-1.2.0/configure.in
---- xfsprogs-1.2.0.org/configure.in    Tue May  1 21:06:43 2001
-+++ xfsprogs-1.2.0/configure.in        Tue May  1 21:51:08 2001
-@@ -28,7 +28,10 @@
- AC_SUBST(malloc_lib)
- 
- dnl Set version
--. VERSION
-+PKG_MAJOR=1
-+PKG_MINOR=2
-+PKG_REVISION=0
-+PKG_BUILD=0
- 
- pkg_version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
- pkg_release=$PKG_BUILD
-@@ -115,15 +118,15 @@
+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
+@@ -133,7 +133,7 @@
        echo 'Install either the e2fsprogs-devel (rpm) or the uuid-dev (deb) package.'
        exit 1
  ])
@@ -22,23 +10,9 @@ diff -urN xfsprogs-1.2.0.org/configure.in xfsprogs-1.2.0/configure.in
  AC_SUBST(libuuid)
  
  dnl Checks for LVM library
--AC_MSG_CHECKING([for liblvm.a])
-+AC_MSG_CHECKING([for liblvm.so])
- liblvm=""
- for dir in /usr/local/lib /usr/lib /lib; do
--        if test -f $dir/liblvm.a; then
--                liblvm=$dir/liblvm.a
-+        if test -f $dir/liblvm.so; then
-+                liblvm="-L$dir -llvm"
-         fi
- done
- if test -n "$liblvm"; then
-@@ -201,16 +204,8 @@
- dnl man pages (source)
- dnl also check if man page source is gzipped
+@@ -201,14 +201,6 @@
  dnl (usually on Debian, but not Redhat pre-7.0)
--pkg_man_dir=${prefix}/man
-+pkg_man_dir=${prefix}/share/man
+ 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