packages: xfsprogs/xfsprogs-sharedlibs.patch, xfsprogs/xfsprogs.spec, xfspr...

[arekm]

Author: arekm                        Date: Thu Nov 11 22:08:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.1.4

---- Files affected:
packages/xfsprogs:
   xfsprogs-sharedlibs.patch (1.5 -> 1.6) , xfsprogs.spec (1.135 -> 1.136) , xfsprogs-install-sh.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xfsprogs/xfsprogs-sharedlibs.patch
diff -u packages/xfsprogs/xfsprogs-sharedlibs.patch:1.5 packages/xfsprogs/xfsprogs-sharedlibs.patch:1.6
--- packages/xfsprogs/xfsprogs-sharedlibs.patch:1.5	Sat Mar 20 22:53:05 2010
+++ packages/xfsprogs/xfsprogs-sharedlibs.patch	Thu Nov 11 23:08:48 2010
@@ -53,6 +53,15 @@
 diff -ur xfsprogs-3.1.1.org/libxcmd/Makefile xfsprogs-3.1.1/libxcmd/Makefile
 --- xfsprogs-3.1.1.org/libxcmd/Makefile	2010-01-29 20:46:13.000000000 +0100
 +++ xfsprogs-3.1.1/libxcmd/Makefile	2010-03-20 21:56:24.000000000 +0100
+@@ -12,6 +12,8 @@
+ 
+ CFILES = command.c input.c paths.c projects.c help.c quit.c
+ 
++LTLIBS = $(LIBREADLINE)
++
+ ifeq ($(HAVE_GETMNTENT),yes)
+ LCFLAGS += -DHAVE_GETMNTENT
+ endif
 @@ -32,6 +32,13 @@
  
  include $(BUILDRULES)

================================================================
Index: packages/xfsprogs/xfsprogs.spec
diff -u packages/xfsprogs/xfsprogs.spec:1.135 packages/xfsprogs/xfsprogs.spec:1.136
--- packages/xfsprogs/xfsprogs.spec:1.135	Sat Aug 28 16:39:07 2010
+++ packages/xfsprogs/xfsprogs.spec	Thu Nov 11 23:08:48 2010
@@ -7,14 +7,13 @@
 Summary:	Tools for the XFS filesystem
 Summary(pl.UTF-8):	Narzędzia do systemu plików XFS
 Name:		xfsprogs
-Version:	3.1.3
+Version:	3.1.4
 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:	a6a4777ded0a36fa692b7eb652a85493
+# Source0-md5:	74081975f148bcabcab26c4c3496ede9
 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
@@ -46,6 +45,10 @@
 %define		filterout_ld -Wl,--as-needed
 %endif
 
+# libxlog uses symbols from binary that links to libxlog
+# libxcmd uses ("program") symbol from binary that links to libxcmd
+%define		skip_post_check_so	libxlog.so.0.0.0	libxcmd.so.0.0.0
+
 %define		_sbindir	/sbin
 %define		_bindir		/usr/sbin
 %define		_libdir		/%{_lib}
@@ -119,7 +122,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 # currently obsolete until needed again
 # %patch3 -p1
@@ -300,6 +302,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.136  2010/11/11 22:08:48  arekm
+- up to 3.1.4
+
 Revision 1.135  2010/08/28 14:39:07  arekm
 - up to 3.1.3
 
================================================================

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