From e4397389ffa3fab756e75f97bb4fe91ab8a055e7 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Wed, 9 Sep 2015 16:33:17 -0500
Subject: [PATCH] New upstream release 4.2.0

Obsoletes xfsprogs-qa-devel, yay!
---
 .gitignore    |  1 +
 sources       |  2 +-
 xfsprogs.spec | 86 +++++++--------------------------------------------
 3 files changed, 14 insertions(+), 75 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e1369c..9ed6d30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ xfsprogs-3.1.2.tar.gz
 /xfsprogs-3.2.2.tar.gz
 /xfsprogs-3.2.3.tar.gz
 /xfsprogs-3.2.4.tar.gz
+/xfsprogs-4.2.0.tar.gz
diff --git a/sources b/sources
index e1cfdda..f786b15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c28db88f058ada506fe0ac6a897a1c42  xfsprogs-3.2.4.tar.gz
+e1b9438d3e6775b9df52cc9a13e9f9a6  xfsprogs-4.2.0.tar.gz
diff --git a/xfsprogs.spec b/xfsprogs.spec
index c9e44e2..0fbe73b 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,6 +1,6 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	3.2.4
+Version:	4.2.0
 Release:	1%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
@@ -16,6 +16,8 @@ BuildRequires:	libtool, gettext, libuuid-devel
 BuildRequires:	readline-devel, libblkid-devel >= 2.17-0.1.git5e51568
 Provides:	xfs-cmds
 Obsoletes:	xfs-cmds <= %{version}
+Provides:	xfsprogs-qa-devel
+Obsoletes:	xfsprogs-qa-devel <= %{version}
 Conflicts:	xfsdump < 3.0.1
 
 %description
@@ -45,19 +47,6 @@ You should install xfsprogs-devel if you want to develop XFS
 filesystem-specific programs,  If you install xfsprogs-devel, you'll
 also want to install xfsprogs.
 
-%package qa-devel
-Summary: XFS QA filesystem-specific headers
-Group: Development/Libraries
-Requires: xfsprogs = %{version}-%{release}
-Requires: xfsprogs-devel = %{version}-%{release}
-
-%description qa-devel
-xfsprogs-qa-devel contains headers needed to build the xfstests
-QA suite.
-
-You should install xfsprogs-qa-devel only if you are interested
-in building or running the xfstests QA suite.
-
 %prep
 %setup -q
 
@@ -75,7 +64,7 @@ make V=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make V=1 DIST_ROOT=$RPM_BUILD_ROOT install install-dev install-qa \
+make V=1 DIST_ROOT=$RPM_BUILD_ROOT install install-dev \
 	PKG_ROOT_SBIN_DIR=%{_sbindir} PKG_ROOT_LIB_DIR=%{_libdir}
 
 # nuke .la files, etc
@@ -85,15 +74,6 @@ chmod 0755 $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:
-%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x %{sparc}
-
-%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}
 
 %clean
@@ -118,63 +98,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/xfs/handle.h
 %{_includedir}/xfs/jdm.h
 %{_includedir}/xfs/linux.h
-%ifarch %{multilib_arches}
-%{_includedir}/xfs/platform_defs-%{_arch}.h
-%endif
-%{_includedir}/xfs/platform_defs.h
 %{_includedir}/xfs/xfs.h
+%{_includedir}/xfs/xfs_arch.h
 %{_includedir}/xfs/xfs_fs.h
 %{_includedir}/xfs/xfs_types.h
+%{_includedir}/xfs/xfs_format.h
+%{_includedir}/xfs/xfs_da_format.h
+%{_includedir}/xfs/xfs_log_format.h
 %{_includedir}/xfs/xqm.h
+
 %{_libdir}/*.so
 
-%files qa-devel
-%defattr(-,root,root)
-%{_includedir}/xfs/atomic.h
-%{_includedir}/xfs/bitops.h
-%{_includedir}/xfs/cache.h
-%{_includedir}/xfs/hlist.h
-%{_includedir}/xfs/kmem.h
-%{_includedir}/xfs/libxfs.h
-%{_includedir}/xfs/libxlog.h
-%{_includedir}/xfs/list.h
-%{_includedir}/xfs/parent.h
-%{_includedir}/xfs/radix-tree.h
-%{_includedir}/xfs/swab.h
-%{_includedir}/xfs/xfs_ag.h
-%{_includedir}/xfs/xfs_alloc.h
-%{_includedir}/xfs/xfs_alloc_btree.h
-%{_includedir}/xfs/xfs_arch.h
-%{_includedir}/xfs/xfs_attr_leaf.h
-%{_includedir}/xfs/xfs_attr_remote.h
-%{_includedir}/xfs/xfs_attr_sf.h
-%{_includedir}/xfs/xfs_bit.h
-%{_includedir}/xfs/xfs_bmap.h
-%{_includedir}/xfs/xfs_bmap_btree.h
-%{_includedir}/xfs/xfs_btree.h
-%{_includedir}/xfs/xfs_btree_trace.h
-%{_includedir}/xfs/xfs_cksum.h
-%{_includedir}/xfs/xfs_da_btree.h
-%{_includedir}/xfs/xfs_da_format.h
-%{_includedir}/xfs/xfs_dinode.h
-%{_includedir}/xfs/xfs_dir2.h
-%{_includedir}/xfs/xfs_format.h
-%{_includedir}/xfs/xfs_ialloc.h
-%{_includedir}/xfs/xfs_ialloc_btree.h
-%{_includedir}/xfs/xfs_inode_buf.h
-%{_includedir}/xfs/xfs_inode_fork.h
-%{_includedir}/xfs/xfs_inum.h
-%{_includedir}/xfs/xfs_log_format.h
-%{_includedir}/xfs/xfs_log_recover.h
-%{_includedir}/xfs/xfs_metadump.h
-%{_includedir}/xfs/xfs_quota_defs.h
-%{_includedir}/xfs/xfs_sb.h
-%{_includedir}/xfs/xfs_shared.h
-%{_includedir}/xfs/xfs_trace.h
-%{_includedir}/xfs/xfs_trans_resv.h
-%{_includedir}/xfs/xfs_trans_space.h
-
 %changelog
+* Wed Sep 09 2015 Eric Sandeen <sandeen@redhat.com> 4.2.0-1
+- New upstream release
+
 * Thu Jul 30 2015 Eric Sandeen <sandeen@redhat.com> 3.2.4-1
 - New upstream release
 - Addresses CVE-2012-2150 for xfs_metadump