Update xfsprogs to 2.8.11

Note this picks up the fix for xfs_repair that can deal
with the directory corrution that appeared in 2.6.17 briefly.

Pull in upstream build fix for ppc64 and ia64 as a patch.
This commit is contained in:
rcattela 2006-09-27 18:51:33 +00:00
parent 4f7265f611
commit 741f3a9f8f
2 changed files with 30 additions and 23 deletions

View File

@ -1 +1,2 @@
4699d6e27acc21911b63696bf1df9949 xfsprogs_2.8.4-1.tar.gz fcae4dea0acf79e30d986a38a609be43 xfsprogs_2.8.11-1.tar.gz

View File

@ -1,13 +1,13 @@
Summary: Utilities for managing the XFS filesystem. Summary: Utilities for managing the XFS filesystem
Name: xfsprogs Name: xfsprogs
Version: 2.8.4 Version: 2.8.11
Release: 3 Release: 2%{?dist}
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
URL: http://oss.sgi.com/projects/xfs/ URL: http://oss.sgi.com/projects/xfs/
Source0: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz Source0: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
Source1: xfsprogs-wrapper.h Source1: xfsprogs-wrapper.h
Patch0: xfsprogs-2.7.11-mkfs-inode.patch Patch0: ppc64_build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, libtool, gettext BuildRequires: autoconf, libtool, gettext
BuildRequires: readline-devel, libtermcap-devel BuildRequires: readline-devel, libtermcap-devel
@ -15,8 +15,6 @@ BuildRequires: /usr/include/uuid/uuid.h
Provides: xfs-cmds Provides: xfs-cmds
Obsoletes: xfs-cmds <= %{version} Obsoletes: xfs-cmds <= %{version}
Conflicts: xfsdump < 2.0.0 Conflicts: xfsdump < 2.0.0
# doesn't build on ppc64 right now (#199315)
ExcludeArch: ppc64
%description %description
A set of commands to use the XFS filesystem, including mkfs.xfs. A set of commands to use the XFS filesystem, including mkfs.xfs.
@ -33,7 +31,7 @@ for complete details. This implementation is on-disk compatible
with the IRIX version of XFS. with the IRIX version of XFS.
%package devel %package devel
Summary: XFS filesystem-specific static libraries and headers. Summary: XFS filesystem-specific static libraries and headers
Group: Development/Libraries Group: Development/Libraries
Requires: xfsprogs = %{version}-%{release} Requires: xfsprogs = %{version}-%{release}
@ -47,28 +45,31 @@ also want to install xfsprogs.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .mkfs-inode %patch0 -p1 -b .ppc64-build
#
%build %build
# xfsprogs 2.8.3 is shipping no ./configure # xfsprogs does not ship ./configure
autoconf autoconf
#
# xfsprogs abuses libexecdir # xfsprogs abuses libexecdir
export tagname=CC DEBUG=-DNDEBUG export tagname=CC DEBUG=-DNDEBUG
%configure --libdir=/%{_lib} --libexecdir=%{_libdir} \ %configure \
--sbindir=/sbin --bindir=%{_sbindir} \ --sbindir=/sbin \
--enable-shared=yes \ --libdir=/%{_lib} \
--enable-gettext=yes \ --libexecdir=%{_libdir} \
--enable-readline=yes \ --bindir=%{_sbindir} \
--enable-editline=no \ --enable-shared=yes \
--enable-termcap=yes \ --enable-gettext=yes \
--enable-shared-uuid=yes --enable-readline=yes \
--enable-editline=no \
--enable-termcap=yes \
--enable-shared-uuid=yes
make %{?_smp_mflags} make %{?_smp_mflags}
#
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make DIST_ROOT=$RPM_BUILD_ROOT install install-dev make DIST_ROOT=$RPM_BUILD_ROOT install install-dev
#
# nuke .la files, etc # nuke .la files, etc
rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.la} rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.la}
# fix up symlink to be correct # fix up symlink to be correct
@ -111,6 +112,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so %{_libdir}/*.so
%changelog %changelog
* Tue Sep 26 2006 Russell Cattelan <cattelan@thebarn.com> 2.8.11-2
- add ppc64 build patch
* Thu Sep 21 2006 Russell Cattelan <cattelan@redhat.com> 2.8.11-1
- Upgrade to xfsprogs 2.8.11 Need to pick up important repair fixes
* Tue Jul 18 2006 Jeremy Katz <katzj@redhat.com> - 2.8.4-3 * Tue Jul 18 2006 Jeremy Katz <katzj@redhat.com> - 2.8.4-3
- exclude arch ppc64 for now (#199315) - exclude arch ppc64 for now (#199315)
@ -185,4 +192,3 @@ rm -rf $RPM_BUILD_ROOT
* Thu Apr 10 2003 Axel Thimm <Axel.Thimm@physik.fu-berlin.de> 2.3.9-0_2.90at * Thu Apr 10 2003 Axel Thimm <Axel.Thimm@physik.fu-berlin.de> 2.3.9-0_2.90at
- Rebuilt for Red Hat 9. - Rebuilt for Red Hat 9.