diff --git a/sources b/sources index fb0f122..c41667d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -4699d6e27acc21911b63696bf1df9949 xfsprogs_2.8.4-1.tar.gz +fcae4dea0acf79e30d986a38a609be43 xfsprogs_2.8.11-1.tar.gz + diff --git a/xfsprogs.spec b/xfsprogs.spec index 0d88661..0e6f93b 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,13 +1,13 @@ -Summary: Utilities for managing the XFS filesystem. +Summary: Utilities for managing the XFS filesystem Name: xfsprogs -Version: 2.8.4 -Release: 3 +Version: 2.8.11 +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://oss.sgi.com/projects/xfs/ Source0: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz 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) BuildRequires: autoconf, libtool, gettext BuildRequires: readline-devel, libtermcap-devel @@ -15,8 +15,6 @@ BuildRequires: /usr/include/uuid/uuid.h Provides: xfs-cmds Obsoletes: xfs-cmds <= %{version} Conflicts: xfsdump < 2.0.0 -# doesn't build on ppc64 right now (#199315) -ExcludeArch: ppc64 %description 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. %package devel -Summary: XFS filesystem-specific static libraries and headers. +Summary: XFS filesystem-specific static libraries and headers Group: Development/Libraries Requires: xfsprogs = %{version}-%{release} @@ -47,28 +45,31 @@ also want to install xfsprogs. %prep %setup -q -%patch0 -p1 -b .mkfs-inode - +%patch0 -p1 -b .ppc64-build +# %build -# xfsprogs 2.8.3 is shipping no ./configure +# xfsprogs does not ship ./configure autoconf - +# # xfsprogs abuses libexecdir export tagname=CC DEBUG=-DNDEBUG -%configure --libdir=/%{_lib} --libexecdir=%{_libdir} \ - --sbindir=/sbin --bindir=%{_sbindir} \ - --enable-shared=yes \ - --enable-gettext=yes \ - --enable-readline=yes \ - --enable-editline=no \ - --enable-termcap=yes \ - --enable-shared-uuid=yes +%configure \ + --sbindir=/sbin \ + --libdir=/%{_lib} \ + --libexecdir=%{_libdir} \ + --bindir=%{_sbindir} \ + --enable-shared=yes \ + --enable-gettext=yes \ + --enable-readline=yes \ + --enable-editline=no \ + --enable-termcap=yes \ + --enable-shared-uuid=yes make %{?_smp_mflags} - +# %install rm -rf $RPM_BUILD_ROOT make DIST_ROOT=$RPM_BUILD_ROOT install install-dev - +# # nuke .la files, etc rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.la} # fix up symlink to be correct @@ -111,6 +112,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Tue Sep 26 2006 Russell Cattelan 2.8.11-2 +- add ppc64 build patch + +* Thu Sep 21 2006 Russell Cattelan 2.8.11-1 +- Upgrade to xfsprogs 2.8.11 Need to pick up important repair fixes + * Tue Jul 18 2006 Jeremy Katz - 2.8.4-3 - exclude arch ppc64 for now (#199315) @@ -185,4 +192,3 @@ rm -rf $RPM_BUILD_ROOT * Thu Apr 10 2003 Axel Thimm 2.3.9-0_2.90at - Rebuilt for Red Hat 9. -