From fbb3d892dd7b64e77a58953ecfa687e950a7e59b Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 5 Jul 2006 13:26:08 +0000 Subject: [PATCH] * Tue Jul 04 2006 Robert Scheck 2.8.4-1 - Upgrade to 2.8.4 (#196599 #c2) --- .cvsignore | 4 +--- sources | 2 +- xfsprogs-wrapper.h | 22 ++++++++++++++++++++++ xfsprogs.spec | 32 ++++++++++++++++++++++++++++---- 4 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 xfsprogs-wrapper.h diff --git a/.cvsignore b/.cvsignore index d6a1bd4..02bc99a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -xfsprogs-2.6.13.src.tar.gz -xfsprogs-2.7.3.src.tar.gz -xfsprogs-2.7.11.src.tar.gz +xfsprogs_2.8.4-1.tar.gz diff --git a/sources b/sources index d53491c..fb0f122 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4a78fced98c0f3f32627a473e8e0a59 xfsprogs-2.7.11.src.tar.gz +4699d6e27acc21911b63696bf1df9949 xfsprogs_2.8.4-1.tar.gz diff --git a/xfsprogs-wrapper.h b/xfsprogs-wrapper.h new file mode 100644 index 0000000..66ded61 --- /dev/null +++ b/xfsprogs-wrapper.h @@ -0,0 +1,22 @@ +/* This file is here to prevent a file conflict on multiarch systems. A + * conflict will occur because platform_defs.h has arch-specific definitions. + * + * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */ + +#if defined(__i386__) +#include "platform_defs-i386.h" +#elif defined(__ia64__) +#include "platform_defs-ia64.h" +#elif defined(__powerpc64__) +#include "platform_defs-ppc64.h" +#elif defined(__powerpc__) +#include "platform_defs-ppc.h" +#elif defined(__s390x__) +#include "platform_defs-s390x.h" +#elif defined(__s390__) +#include "platform_defs-s390.h" +#elif defined(__x86_64__) +#include "platform_defs-x86_64.h" +#else +#error "This xfsprogs-devel package does not work your architecture?" +#endif diff --git a/xfsprogs.spec b/xfsprogs.spec index a0fdb7a..400afe1 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,12 +1,14 @@ Summary: Utilities for managing the XFS filesystem. Name: xfsprogs -Version: 2.7.11 +Version: 2.8.4 Release: 1 License: GPL Group: System Environment/Base URL: http://oss.sgi.com/projects/xfs/ -Source: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/xfsprogs-%{version}.src.tar.gz -BuildRoot: %{_tmppath}/%{name}-root +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, libtool, gettext BuildRequires: readline-devel, libtermcap-devel BuildRequires: /usr/include/uuid/uuid.h @@ -43,8 +45,12 @@ also want to install xfsprogs. %prep %setup -q +%patch0 -p1 -b .mkfs-inode %build +# xfsprogs 2.8.3 is shipping no ./configure +autoconf + # xfsprogs abuses libexecdir export tagname=CC DEBUG=-DNDEBUG %configure --libdir=/%{_lib} --libexecdir=%{_libdir} \ @@ -69,6 +75,13 @@ ln -s ../../%{_lib}/libhandle.so.1 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so # remove non-versioned docs location rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/ +# ugly hack to allow parallel install of 32-bit and 64-bit -devel packages: +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 + +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -76,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root) %doc doc/CHANGES doc/COPYING doc/CREDITS doc/PORTING README /sbin/fsck.xfs @@ -96,6 +109,17 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Tue Jul 04 2006 Robert Scheck 2.8.4-1 +- Upgrade to 2.8.4 (#196599 #c2) + +* Sun Jun 25 2006 Robert Scheck 2.8.3-1 +- Upgrade to 2.8.3 (#196599) +- Applied Russell Coker's suggested patch to improve the + performance for SELinux machines significantly (#120622) + +* Sun Jun 25 2006 Robert Scheck 2.7.11-2 +- Fixed multilib conflict of xfs/platform_defs.h (#192755) + * Sun Mar 12 2006 Robert Scheck 2.7.11-1 - Upgrade to 2.7.11 and spec file cleanup (#185234)