* Tue Jul 04 2006 Robert Scheck <redhat@linuxnetz.de> 2.8.4-1

- Upgrade to 2.8.4 (#196599 #c2)

.cvsignore

@@ -1,3 +1 @@
-xfsprogs-2.6.13.src.tar.gz
+xfsprogs_2.8.4-1.tar.gz
-xfsprogs-2.7.3.src.tar.gz
-xfsprogs-2.7.11.src.tar.gz

sources

@@ -1 +1 @@
-d4a78fced98c0f3f32627a473e8e0a59  xfsprogs-2.7.11.src.tar.gz
+4699d6e27acc21911b63696bf1df9949  xfsprogs_2.8.4-1.tar.gz

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

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
+Source0: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
+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 <redhat@linuxnetz.de> 2.8.4-1
+- Upgrade to 2.8.4 (#196599 #c2)
+
+* Sun Jun 25 2006 Robert Scheck <redhat@linuxnetz.de> 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 <redhat@linuxnetz.de> 2.7.11-2
+- Fixed multilib conflict of xfs/platform_defs.h (#192755)
+
 * Sun Mar 12 2006 Robert Scheck <redhat@linuxnetz.de> 2.7.11-1
 - Upgrade to 2.7.11 and spec file cleanup (#185234)