- up to 3.1.3

Changed files:
    xfsprogs-LDFLAGS.patch -> 1.4
    xfsprogs-miscfix-v2.patch -> 1.6
    xfsprogs-static-librt.patch -> 1.2
    xfsprogs.spec -> 1.135

diff --git a/xfsprogs-LDFLAGS.patch b/xfsprogs-LDFLAGS.patch
deleted file mode 100644 (file)
index ff1f3bb..0000000
--- a/xfsprogs-LDFLAGS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur xfsprogs-2.8.11.orig/include/builddefs.in xfsprogs-2.8.11.LDFLAGS/include/builddefs.in
---- xfsprogs-2.8.11.orig/include/builddefs.in  2006-07-17 01:22:02.000000000 +0200
-+++ xfsprogs-2.8.11.LDFLAGS/include/builddefs.in       2006-08-24 13:13:29.000000000 +0200
-@@ -24,6 +24,7 @@
- OPTIMIZER = @opt_build@
- MALLOCLIB = @malloc_lib@
- LOADERFLAGS = @LDFLAGS@
-+LTLDFLAGS = @LDFLAGS@
- 
- LIBRT = @librt@
- LIBUUID = @libuuid@
-diff -Nur xfsprogs-2.8.11.orig/libxfs/Makefile xfsprogs-2.8.11.LDFLAGS/libxfs/Makefile
---- xfsprogs-2.8.11.orig/libxfs/Makefile       2006-08-24 13:13:28.000000000 +0200
-+++ xfsprogs-2.8.11.LDFLAGS/libxfs/Makefile    2006-08-24 13:13:57.000000000 +0200
-@@ -34,6 +34,8 @@
- 
- FCFLAGS = -I.
- 
-+LTLIBS = $(LIBPTHREAD) $(LIBRT)
-+
- # don't try linking xfs_repair with a debug libxfs.
- DEBUG = -DNDEBUG
- 

diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch
index 8e470b9579f4ded34bb155be5f52211747458a6f..a47d926d4105716360fa75ba3becbf65c955931a 100644 (file)
--- a/xfsprogs-miscfix-v2.patch
+++ b/xfsprogs-miscfix-v2.patch
@@ -14,3 +14,18 @@
      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
+ 

diff --git a/xfsprogs-static-librt.patch b/xfsprogs-static-librt.patch
deleted file mode 100644 (file)
index 3490eda..0000000
--- a/xfsprogs-static-librt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfsprogs-3.0.0/m4/package_aiodev.m4~       2009-02-04 23:29:25.000000000 +0100
-+++ xfsprogs-3.0.0/m4/package_aiodev.m4        2009-03-19 17:11:50.000000000 +0100
-@@ -29,7 +29,7 @@
-       AC_CHECK_LIB(rt, lio_listio,, [
-           echo
-           echo 'FATAL ERROR: could not find a library with lio_listio.'
--          exit 1])
-+          exit 1],[-lpthread])
-       librt="-lrt"
-     fi
-     AC_SUBST(librt)

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 3094150f0e9a4ba9c3ac8498ffbc3441f9cca7da..20bc539a8d14808eeeb2e52991691f58736f495a 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -6,20 +6,18 @@
 Summary:       Tools for the XFS filesystem
 Summary(pl.UTF-8):     Narzędzia do systemu plików XFS
 Name:          xfsprogs
-Version:       3.1.2
+Version:       3.1.3
 Release:       1
 License:       LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group:         Applications/System
 Source0:       ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
-# Source0-md5: 86d10178ee6897cb099c97303e6d9da0
+# Source0-md5: a6a4777ded0a36fa692b7eb652a85493
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-install-sh.patch
 Patch2:                %{name}-sharedlibs.patch
 Patch3:                %{name}-pl.po-update.patch
 Patch4:                %{name}-dynamic_exe.patch
-Patch5:                %{name}-LDFLAGS.patch
-Patch6:                %{name}-diet.patch
-Patch7:                %{name}-static-librt.patch
+Patch5:                %{name}-diet.patch
 URL:           http://www.xfs.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -126,8 +124,6 @@ Zbiór komend do użytku z systemem plików XFS, włączając w to mkfs.xfs
 # %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 rm -f include/{builddefs,platform_defs}.h
 
@@ -184,6 +180,7 @@ sed -i -e 's|\(^LLDLIBS.*=.*\) -lcompat|\1|' db/Makefile mkfs/Makefile
        --sbindir=%{_bindir}\
        --enable-gettext \
        --enable-readline \
+       --enable-blkid \
        DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
        OPTIMIZER="%{rpmcflags}"