diff --git a/sources b/sources index c8e55e7..9e1b83a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9079d9a8dbc7cc983ed518842ca909f xfsprogs_2.9.5-1.tar.gz +f32ab3282c3e02ce25128f7a6c2d5157 xfsprogs_2.9.8-1.tar.gz diff --git a/xfsprogs-wrapper.h b/xfsprogs-wrapper.h index 7b7ecfd..8c486bf 100644 --- a/xfsprogs-wrapper.h +++ b/xfsprogs-wrapper.h @@ -5,8 +5,8 @@ #if defined(__i386__) #include "platform_defs-i386.h" -#elif defined(__ia64__) -#include "platform_defs-ia64.h" +#elif defined(__x86_64__) +#include "platform_defs-x86_64.h" #elif defined(__powerpc64__) #include "platform_defs-ppc64.h" #elif defined(__powerpc__) @@ -15,12 +15,10 @@ #include "platform_defs-s390x.h" #elif defined(__s390__) #include "platform_defs-s390.h" -#elif defined(__x86_64__) -#include "platform_defs-x86_64.h" -#elif defined(__alpha__) -#include "platform_defs-alpha.h" -#elif defined(__arm__) -#include "platform_defs-arm.h" +#elif defined(__sparc__) && defined(__arch64__) +#include "platform_defs-sparc64.h" +#elif defined(__sparc64__) +#include "platform_defs-sparc.h" #else #error "This xfsprogs-devel package does not work your architecture?" #endif diff --git a/xfsprogs.spec b/xfsprogs.spec index a9d4462..3516434 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs -Version: 2.9.5 -Release: 1%{?dist} +Version: 2.9.8 +Release: 3%{?dist} # Licensing based on generic "GNU GENERAL PUBLIC LICENSE" # in source, with no mention of version. # doc/COPYING file specifies what is GPL and what is LGPL @@ -12,8 +12,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf, libtool, gettext, gawk -BuildRequires: readline-devel +BuildRequires: libtool, gettext BuildRequires: /usr/include/uuid/uuid.h Provides: xfs-cmds Obsoletes: xfs-cmds <= %{version} @@ -74,9 +73,13 @@ ln -s ../../%{_lib}/libhandle.so.1 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/ # ugly hack to allow parallel install of 32-bit and 64-bit -devel packages: +%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 + +%ifarch %{multilib_arches} mv -f $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs.h \ $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs-%{_arch}.h install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs.h +%endif %find_lang %{name} @@ -107,6 +110,26 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Wed Jun 04 2008 Dennis Gilmore 2.9.8-3 +- sparc32 is built using the sparcv9 variant + +* Wed Jun 04 2008 Eric Sandeen 2.9.8-2 +- Tidy up multilib hack for non-multilib arches & add sparc (#448452) + +* Wed Apr 23 2008 Eric Sandeen 2.9.8-1 +- Update to xfsprogs 2.9.8 +- Add support for sb_features2 in wrong location +- Add -c option to xfs_admin to turn lazy-counters on/off +- Added support for mdp in libdisk/mkfs.xfs + +* Sun Mar 02 2008 Eric Sandeen 2.9.7-1 +- Update to xfsprogs 2.9.7 +- Lazy sb counters back off by default; other misc fixes + +* Wed Feb 06 2008 Eric Sandeen 2.9.6-1 +- Update to xfsprogs 2.9.6 - fixes mkfs sizing problem. +- Trim down BuildRequires to what's actually required now + * Mon Jan 21 2008 Eric Sandeen 2.9.5-1 - Update to xfsprogs 2.9.5 - Contains more optimal mkfs defaults