From 2e37129d185b1e6541a230fad1cca3f848f61f0f Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Tue, 18 Oct 2016 22:02:02 -0500
Subject: [PATCH] New uptream release 4.8.0

---
 .gitignore         |  1 +
 sources            |  2 +-
 xfsprogs-wrapper.h | 24 ------------------------
 xfsprogs.spec      | 10 ++++++----
 4 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 xfsprogs-wrapper.h

diff --git a/.gitignore b/.gitignore
index 127536b..9bc7ac3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ xfsprogs-3.1.2.tar.gz
 /xfsprogs-4.3.0.tar.gz
 /xfsprogs-4.5.0.tar.gz
 /xfsprogs-4.7.0.tar.gz
+/xfsprogs-4.8.0.tar.gz
diff --git a/sources b/sources
index 4ae1770..f008dd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae82b0ab63e89cfda52fb9859855bafa  xfsprogs-4.7.0.tar.gz
+8643cc207411b7f667620fdde6ef9e79  xfsprogs-4.8.0.tar.gz
diff --git a/xfsprogs-wrapper.h b/xfsprogs-wrapper.h
deleted file mode 100644
index 66cbb2d..0000000
--- a/xfsprogs-wrapper.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 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(__x86_64__)
-#include "platform_defs-x86_64.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(__sparc__) && defined(__arch64__)
-#include "platform_defs-sparc64.h"
-#elif defined(__sparc__)
-#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 8c167ab..a6b0fa7 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	4.7.0
-Release:	2%{?dist}
+Version:	4.8.0
+Release:	1%{?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
@@ -9,8 +9,7 @@ Release:	2%{?dist}
 License:	GPL+ and LGPLv2+
 Group:		System Environment/Base
 URL:		http://oss.sgi.com/projects/xfs/
-Source0:	ftp://oss.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
-Source1:	xfsprogs-wrapper.h
+Source0:	http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool, gettext, libattr-devel, libuuid-devel
 BuildRequires:	readline-devel, libblkid-devel >= 2.17-0.1.git5e51568
@@ -110,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Tue Oct 18 2016 Eric Sandeen <sandeen@redhat.com> 4.8.0-1
+- New upstream release
+
 * Tue Sep 06 2016 Eric Sandeen <sandeen@redhat.com> 4.7.0-2
 - Add libattr-devel build dependency to fix xfs_fsr