- up to 3.1.4

Changed files:
    xfsprogs-install-sh.patch -> 1.2
    xfsprogs-sharedlibs.patch -> 1.6
    xfsprogs.spec -> 1.136

diff --git a/xfsprogs-install-sh.patch b/xfsprogs-install-sh.patch
deleted file mode 100644 (file)
index b8172ee..0000000
--- a/xfsprogs-install-sh.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN ./old/xfsprogs-1.3.5/install-sh ./xfsprogs-1.3.5/install-sh
---- ./old/xfsprogs-1.3.5/install-sh    Thu Aug  9 21:04:54 2001
-+++ xfsprogs-1.3.5/install-sh  Thu Aug 30 08:41:32 2001
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- #
- # Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- # 

diff --git a/xfsprogs-sharedlibs.patch b/xfsprogs-sharedlibs.patch
index 9ab2c41a392e3244bd492d6e553b197d85249d3a..f598c3ece012c2b82cfddbec71de8195288c098f 100644 (file)
--- a/xfsprogs-sharedlibs.patch
+++ b/xfsprogs-sharedlibs.patch
@@ -53,6 +53,15 @@ diff -ur xfsprogs-3.0.0.org/libxlog/Makefile xfsprogs-3.0.0/libxlog/Makefile
 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)

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 20bc539a8d14808eeeb2e52991691f58736f495a..6d3b1218e8580cfe2cfed8f60c70fd0566e7e4e1 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -6,14 +6,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
@@ -45,6 +44,10 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %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}
@@ -118,7 +121,6 @@ Zbiór komend do użytku z systemem plików XFS, włączając w to mkfs.xfs
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 # currently obsolete until needed again
 # %patch3 -p1