From 71cdeac3a3e317adda8b28862da6cffb48a25407 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 26 Apr 2018 14:02:41 -0500
Subject: [PATCH] New upstream release v4.16

---
 .gitignore    |  1 +
 sources       |  2 +-
 xfsprogs.spec | 26 +++++++++++++-------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b9c76b..359e5eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ xfsprogs-3.1.2.tar.gz
 /xfsprogs-4.14.0.tar.xz
 /xfsprogs-4.15.0.tar.xz
 /xfsprogs-4.15.1.tar.xz
+/xfsprogs-4.16.0.tar.xz
diff --git a/sources b/sources
index b2c8263..3986143 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xfsprogs-4.15.1.tar.xz) = 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee
+SHA512 (xfsprogs-4.16.0.tar.xz) = 0ca0cb3347ccc103f92f496016beaf5e5742fea2a4ca8515f6e340537e446df09483d9d30ce159789eb05a73430f8d517e57d1a8548029f1e73c108484b4e6e8
diff --git a/xfsprogs.spec b/xfsprogs.spec
index 995fc02..40a81e3 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,6 +1,6 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	4.15.1
+Version:	4.16.0
 Release:	1%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
@@ -8,12 +8,12 @@ Release:	1%{?dist}
 # but no mention of versions in the source.
 License:	GPL+ and LGPLv2+
 Group:		System Environment/Base
-URL:		http://oss.sgi.com/projects/xfs/
+URL:		https://xfs.wiki.kernel.org
 Source0:	http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
 BuildRequires:	gcc
 BuildRequires:	libtool, gettext, libattr-devel, libuuid-devel
 BuildRequires:	readline-devel, libblkid-devel >= 2.17-0.1.git5e51568
-Buildrequires:	libunistring-devel, lvm2-devel
+Buildrequires:	lvm2-devel, libicu-devel >= 4.6
 Provides:	xfs-cmds
 Obsoletes:	xfs-cmds <= %{version}
 Provides:	xfsprogs-qa-devel
@@ -52,24 +52,20 @@ also want to install xfsprogs.
 
 %build
 export tagname=CC
+
 %configure \
         --enable-readline=yes	\
-	--enable-blkid=yes
+	--enable-blkid=yes	\
+	--enable-lto=no
 
-# Kill rpaths
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make V=1 %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make V=1 DIST_ROOT=$RPM_BUILD_ROOT install install-dev \
+make DIST_ROOT=$RPM_BUILD_ROOT install install-dev \
 	PKG_ROOT_SBIN_DIR=%{_sbindir} PKG_ROOT_LIB_DIR=%{_libdir}
 
 # nuke .la files, etc
 rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.{la,a}}
-chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so.*.*.*
 
 # remove non-versioned docs location
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
@@ -82,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc doc/CHANGES doc/COPYING doc/CREDITS README
+%doc doc/CHANGES doc/COPYING README
 %{_libdir}/*.so.*
 %dir %{_usr}/%{_lib}/xfsprogs
 %{_usr}/%{_lib}/xfsprogs/*
@@ -111,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr 26 2018 Eric Sandeen <sandeen@redhat.com> 4.16.0-1
+- New upstream release
+- Clean up specfile
+
 * Mon Feb 26 2018 Eric Sandeen <sandeen@redhat.com> 4.15.1-1
 - New upstream release
 - Update Polish translation