- release 2 (by relup.sh)

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 50118e496f9943c33223cf57bedbdecef3b0d9ab..c02a906787ab251e25aa9027e7c5d03714a43672 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -7,22 +7,20 @@
 Summary:       Tools for the XFS filesystem
 Summary(pl.UTF-8):     Narzędzia do systemu plików XFS
 Name:          xfsprogs
-Version:       3.1.7
+Version:       3.1.10
 Release:       2
 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: 049cf9873794ea49d0bb3f12d45748a4
+# Source0-md5: d6159f7a664d95b4c150d580399d4400
 Source1:       xfs_lsprojid
 Patch0:                %{name}-miscfix-v2.patch
 Patch2:                %{name}-sharedlibs.patch
 Patch3:                %{name}-pl.po-update.patch
 Patch4:                %{name}-dynamic_exe.patch
 Patch5:                %{name}-diet.patch
-Patch6:                xfsprogs-repair-mem.patch
-Patch7:                xfsprogs-repair-nofutexhang.patch
-Patch8:                xfsprogs-repair-tcmalloc.patch
-Patch9:                %{name}-noquotasync.patch
+Patch6:                %{name}-repair-tcmalloc.patch
+Patch7:                %{name}-noquotasync.patch
 URL:           http://www.xfs.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -44,7 +42,7 @@ BuildRequires:        libuuid-devel
 BuildRequires: readline-devel
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.402
-Requires:      libtcmalloc >= 1.8.3-3
+%{?with_tcmalloc:Requires:     libtcmalloc >= 1.8.3-3}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if "%{pld_release}" == "ac"
@@ -130,13 +128,11 @@ Zbiór komend do użytku z systemem plików XFS, włączając w to mkfs.xfs
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
+%{?with_tcmalloc:%patch6 -p1}
 %patch7 -p1
-%{?with_tcmalloc:%patch8 -p1}
-%patch9 -p1
 
 %build
 %{__aclocal} -I m4
@@ -147,7 +143,7 @@ Zbiór komend do użytku z systemem plików XFS, włączając w to mkfs.xfs
 # dietlibc has needed librt stuff in libc/libpthread
 sed -i -e 's|^AC_PACKAGE_NEED_AIO_H|dnl AC_PACKAGE_NEED_AIO_H|' \
        -e 's|^AC_PACKAGE_NEED_LIO_LISTIO|dnl AC_PACKAGE_NEED_LIO_LISTIO|' \
-       configure.in
+       configure.ac
 sed -i -e 's|\(^LIBRT.*=.*\)|# \1|' include/builddefs.in
 sed -i -e 's|\(^LLDLIBS.*=.*\)|\1 -lcompat|' db/Makefile mkfs/Makefile
 %endif
@@ -180,7 +176,7 @@ mv -f repair/xfs_repair initrd/xfs_repair
 %if %{with dietlibc}
 sed -i -e 's|^dnl AC_PACKAGE_NEED_AIO_H|AC_PACKAGE_NEED_AIO_H|' \
        -e 's|^dnl AC_PACKAGE_NEED_LIO_LISTIO|AC_PACKAGE_NEED_LIO_LISTIO|' \
-       configure.in
+       configure.ac
 sed -i -e 's|^# \(LIBRT.*=.*\)|\1|' include/builddefs.in
 sed -i -e 's|\(^LLDLIBS.*=.*\) -lcompat|\1|' db/Makefile mkfs/Makefile
 %endif