packages: xfsprogs/xfsprogs-miscfix-v2.patch, xfsprogs/xfsprogs.spec, xfspr...

[arekm]

Author: arekm                        Date: Sat Aug 28 14:39:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.1.3

---- Files affected:
packages/xfsprogs:
   xfsprogs-miscfix-v2.patch (1.5 -> 1.6) , xfsprogs.spec (1.134 -> 1.135) , xfsprogs-LDFLAGS.patch (1.3 -> NONE)  (REMOVED), xfsprogs-static-librt.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xfsprogs/xfsprogs-miscfix-v2.patch
diff -u packages/xfsprogs/xfsprogs-miscfix-v2.patch:1.5 packages/xfsprogs/xfsprogs-miscfix-v2.patch:1.6
--- packages/xfsprogs/xfsprogs-miscfix-v2.patch:1.5	Sat Mar 20 20:50:28 2010
+++ packages/xfsprogs/xfsprogs-miscfix-v2.patch	Sat Aug 28 16:39:07 2010
@@ -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
+ 

================================================================
Index: packages/xfsprogs/xfsprogs.spec
diff -u packages/xfsprogs/xfsprogs.spec:1.134 packages/xfsprogs/xfsprogs.spec:1.135
--- packages/xfsprogs/xfsprogs.spec:1.134	Mon May 10 19:14:28 2010
+++ packages/xfsprogs/xfsprogs.spec	Sat Aug 28 16:39:07 2010
@@ -7,20 +7,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
@@ -127,8 +125,6 @@
 # %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 rm -f include/{builddefs,platform_defs}.h
 
@@ -185,6 +181,7 @@
 	--sbindir=%{_bindir}\
 	--enable-gettext \
 	--enable-readline \
+	--enable-blkid \
 	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
 	OPTIMIZER="%{rpmcflags}"
 
@@ -303,6 +300,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2010/08/28 14:39:07  arekm
+- up to 3.1.3
+
 Revision 1.134  2010/05/10 17:14:28  arekm
 - up to 3.1.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfsprogs/xfsprogs-miscfix-v2.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfsprogs/xfsprogs.spec?r1=1.134&r2=1.135&f=u