- rebuild with readline 7.0

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index fa7a906772e5d5509fab7c7c8cd70e6c49b3c54e..42fd53aa59cb19c8e71586bc720de5940a985599 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,34 +1,29 @@
-#
-# Conditional build:
-%bcond_without tcmalloc        # don't use tcmalloc
-#
 Summary:       Tools for the XFS filesystem
 Summary(pl.UTF-8):     Narzędzia do systemu plików XFS
 Name:          xfsprogs
-Version:       3.2.0
+Version:       4.7.0
 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: 400047b2f6af87c0345b8f0cc00c13db
+# Source0-md5: ae82b0ab63e89cfda52fb9859855bafa
 Source1:       xfs_lsprojid
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-pl.po-update.patch
-Patch2:                %{name}-repair-tcmalloc.patch
-Patch3:                %{name}-noquotasync.patch
+Patch2:                %{name}-noquotasync.patch
 URL:           http://www.xfs.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: bash
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
+BuildRequires: glibc-static
 BuildRequires: libblkid-devel
-%{?with_tcmalloc:BuildRequires:        libtcmalloc-devel}
 BuildRequires: libtool
 BuildRequires: libuuid-devel
+BuildRequires: libuuid-static
 BuildRequires: readline-devel
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.402
-%{?with_tcmalloc:Requires:     libtcmalloc >= 1.8.3-3}
 Obsoletes:     xfsprogs-initrd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -94,10 +89,8 @@ Biblioteki statyczne do XFS.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-%{?with_tcmalloc:%patch2 -p1}
-%patch3 -p1
+%patch1 -p1 -b .orig
+%patch2 -p1
 
 %build
 %{__aclocal} -I m4
@@ -132,8 +125,8 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xfs_lsprojid
 ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libhandle.so.*.*.*) \
         $RPM_BUILD_ROOT%{_libexecdir}/libhandle.so
 
-mv $RPM_BUILD_ROOT%{_libdir}/lib*.la $RPM_BUILD_ROOT%{_libexecdir}
-mv $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libexecdir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/lib*.la $RPM_BUILD_ROOT%{_libexecdir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libexecdir}
 
 %{__sed} -i -e "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
        $RPM_BUILD_ROOT%{_libexecdir}/libhandle.la