From f0275125d166244dd226e861c99b42458b1aec95 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 4 Jun 2008 17:38:01 +0000 Subject: [PATCH] * Wed Apr 23 2008 Eric Sandeen 2.9.8-2 - Tidy up multilib hack for non-multilib arches & add sparc (#448452) --- xfsprogs-wrapper.h | 14 ++++++-------- xfsprogs.spec | 9 ++++++++- 2 files changed, 14 insertions(+), 9 deletions(-) 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 c724e6b..5085422 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -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 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