* Wed Apr 23 2008 Eric Sandeen <sandeen@redhat.com> 2.9.8-2

- Tidy up multilib hack for non-multilib arches & add sparc (#448452)
This commit is contained in:
Eric Sandeen 2008-06-04 17:38:01 +00:00
parent 7b45997fb8
commit f0275125d1
2 changed files with 14 additions and 9 deletions

View File

@ -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

View File

@ -1,7 +1,7 @@
Summary: Utilities for managing the XFS filesystem
Name: xfsprogs
Version: 2.9.8
Release: 1%{?dist}
Release: 2%{?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
@ -73,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 sparc 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}
@ -106,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so
%changelog
* Wed Apr 23 2008 Eric Sandeen <sandeen@redhat.com> 2.9.8-2
- Tidy up multilib hack for non-multilib arches & add sparc (#448452)
* Wed Apr 23 2008 Eric Sandeen <sandeen@redhat.com> 2.9.8-1
- Update to xfsprogs 2.9.8
- Add support for sb_features2 in wrong location