- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-xfsprogs_2.10.1-1.tar.gz

.gitignore

@@ -0,0 +1,39 @@
+xfsprogs-3.1.2.tar.gz
+/xfsprogs-3.1.3.tar.gz
+/xfsprogs-3.1.4.tar.gz
+/xfsprogs-3.1.5.tar.gz
+/xfsprogs-3.1.6.tar.gz
+/xfsprogs-3.1.7.tar.gz
+/xfsprogs-3.1.8.tar.gz
+/xfsprogs-3.1.9.tar.gz
+/xfsprogs-3.1.10.tar.gz
+/xfsprogs-3.1.11.tar.gz
+/xfsprogs-3.2.0-alpha1.tar.gz
+/xfsprogs-3.2.0-alpha2.tar.gz
+/xfsprogs-3.2.0-rc2.tar.gz
+/xfsprogs-3.2.0-rc3.tar.gz
+/xfsprogs-3.2.0.tar.gz
+/xfsprogs-3.2.1.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
+/xfsprogs-4.3.0.tar.gz
+/xfsprogs-4.5.0.tar.gz
+/xfsprogs-4.7.0.tar.gz
+/xfsprogs-4.8.0.tar.gz
+/xfsprogs-4.9.0.tar.xz
+/xfsprogs-4.10.0.tar.xz
+/xfsprogs-4.11.0.tar.xz
+/xfsprogs-4.12.0.tar.xz
+/xfsprogs-4.13.1.tar.xz
+/xfsprogs-4.14.0.tar.xz
+/xfsprogs-4.15.0.tar.xz
+/xfsprogs-4.15.1.tar.xz
+/xfsprogs-4.16.0.tar.xz
+/xfsprogs-4.17.0.tar.xz
+/xfsprogs-4.18.0.tar.xz
+/xfsprogs-4.19.0.tar.xz
+/xfsprogs-4.20.0.tar.xz
+/xfsprogs-5.0.0.tar.xz
+/xfsprogs-5.1.0.tar.xz

Makefile

@@ -4,7 +4,7 @@ NAME := xfsprogs
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

sources

@@ -1 +1 @@
-8f0410aa8cfea0936969a3aab447009c  xfsprogs_2.10.1-1.tar.gz
+SHA512 (xfsprogs-5.1.0.tar.xz) = ca5959edb299be8574b2ca51e907a418fab796ae92f588075a2aab0c2a3cf8dae49e2b68679c65c361201223e8f8ac29b1e5618eb1e519496c3aca9218620881

xfsprogs-2.10.1-libdisk-gfs2.patch

@@ -1,120 +0,0 @@
-Recognize gfs & gfs2 disk formats.
-
-Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
----
-
-Index: xfs-cmds-build/xfsprogs/libdisk/fstype.c
-===================================================================
---- xfs-cmds-build.orig/xfsprogs/libdisk/fstype.c
-+++ xfs-cmds-build/xfsprogs/libdisk/fstype.c
-@@ -68,6 +68,7 @@ swapped(unsigned short a) {
-     Added jfs - Christoph Hellwig
-     Added sysv - Tim Launchbury
-     Added udf - Bryce Nesbitt
-+    Added gfs/gfs2 - Eric Sandeen
- */
- 
- /*
-@@ -192,6 +193,7 @@ fstype(const char *device) {
-     struct hpfs_super_block hpfssb;
-     struct adfs_super_block adfssb;
-     struct sysv_super_block svsb;
-+    struct gfs2_sb gfs2sb;
-     struct stat statbuf;
- 
-     /* opening and reading an arbitrary unknown path can have
-@@ -382,6 +384,21 @@ fstype(const char *device) {
-     }
- 
-     if (!type) {
-+	/* block 64 */
-+	if (lseek(fd, GFS_SUPERBLOCK_OFFSET, SEEK_SET) != GFS_SUPERBLOCK_OFFSET
-+	    || read(fd, (char *) &gfs2sb, sizeof(gfs2sb)) != sizeof(gfs2sb))
-+	    goto io_error;
-+	if (gfsmagic(gfs2sb)) {
-+		if (gfsformat(gfs2sb) == GFS_FORMAT_FS &&
-+		    gfsmultiformat(gfs2sb) == GFS_FORMAT_MULTI)
-+			type = "gfs";
-+		else if (gfsformat(gfs2sb) == GFS2_FORMAT_FS &&
-+			 gfsmultiformat(gfs2sb) == GFS2_FORMAT_MULTI)
-+			type = "gfs2";
-+	}
-+    }
-+
-+    if (!type) {
- 	    /* perhaps the user tries to mount the swap space
- 	       on a new disk; warn her before she does mkfs on it */
- 	    int pagesize = getpagesize();
-Index: xfs-cmds-build/xfsprogs/libdisk/fstype.h
-===================================================================
---- xfs-cmds-build.orig/xfsprogs/libdisk/fstype.h
-+++ xfs-cmds-build/xfsprogs/libdisk/fstype.h
-@@ -242,6 +242,56 @@ struct ocfs_volume_label {
- #define ocfslabellen(o)	assemble2le(o.label_len)
- #define OCFS_MAGIC	"OracleCFS"
- 
-+/* Common gfs/gfs2 constants: */
-+#define GFS_MAGIC               0x01161970
-+#define GFS_DEFAULT_BSIZE       4096
-+#define GFS_SUPERBLOCK_OFFSET	(0x10 * GFS_DEFAULT_BSIZE)
-+#define GFS_LOCKNAME_LEN        64
-+
-+/* gfs1 constants: */
-+#define GFS_FORMAT_FS           1309
-+#define GFS_FORMAT_MULTI        1401
-+/* gfs2 constants: */
-+#define GFS2_FORMAT_FS          1801
-+#define GFS2_FORMAT_MULTI       1900
-+
-+struct gfs2_meta_header {
-+	char mh_magic[4];
-+	char mh_type[4];
-+	char __pad0[8];          /* Was generation number in gfs1 */
-+	char mh_format[4];
-+	char __pad1[4];          /* Was incarnation number in gfs1 */
-+};
-+
-+struct gfs2_inum {
-+	char no_formal_ino[8];
-+	char no_addr[8];
-+};
-+
-+struct gfs2_sb {
-+	struct gfs2_meta_header sb_header;
-+
-+	char sb_fs_format[4];
-+	char sb_multihost_format[4];
-+	char  __pad0[4];  /* Was superblock flags in gfs1 */
-+
-+	char sb_bsize[4];
-+	char sb_bsize_shift[4];
-+	char __pad1[4];   /* Was journal segment size in gfs1 */
-+
-+	struct gfs2_inum sb_master_dir; /* Was jindex dinode in gfs1 */
-+	struct gfs2_inum __pad2; /* Was rindex dinode in gfs1 */
-+	struct gfs2_inum sb_root_dir;
-+
-+	char sb_lockproto[GFS_LOCKNAME_LEN];
-+	char sb_locktable[GFS_LOCKNAME_LEN];
-+	/* In gfs1, quota and license dinodes followed */
-+};
-+
-+#define gfsmagic(s)		assemble4be(s.sb_header.mh_magic)
-+#define gfsformat(s)		assemble4be(s.sb_fs_format)
-+#define gfsmultiformat(s)	assemble4be(s.sb_multihost_format)
-+
- static inline int
- assemble2le(char *p) {
- 	return (p[0] | (p[1] << 8));
-@@ -251,3 +301,8 @@ static inline int
- assemble4le(char *p) {
- 	return (p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24));
- }
-+
-+static inline int
-+assemble4be(char *p) {
-+	return (p[3] | (p[2] << 8) | (p[1] << 16) | (p[0] << 24));
-+}
-
-
-

xfsprogs-2.10.1-parallel-build.patch

@@ -1,189 +0,0 @@
-
-w parallel builds of the xfsprogs package
-
-I got tired of waiting for xfsprogs to build
-serially...
-
-On a 16p altix, make -j16 (excluding the configure
-phase) went from 2m16s to 15s.
-
-I tossed this into an rpm and did a fedora scratch
-build on all arches, they all passed - some of them,
-at least, should have been doing parallel builds too.
-
-So this has had reasonable testing.
-
-Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
----
-
-Index: xfs-cmds/xfsprogs/Makefile
-===================================================================
---- xfs-cmds.orig/xfsprogs/Makefile
-+++ xfs-cmds/xfsprogs/Makefile
-@@ -15,24 +15,36 @@ LSRCFILES = configure configure.in Makep
- LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
- 	Logs/* built .census install.* install-dev.* *.gz
- 
--SUBDIRS = include libxfs libxlog libxcmd libhandle libdisk \
--	copy db fsck growfs io logprint mkfs quota mdrestore repair rtcp \
--	m4 man doc po debian build
-+LIB_SUBDIRS = include libxfs libxlog libxcmd libhandle libdisk
-+TOOL_SUBDIRS = copy db fsck growfs io logprint mkfs quota \
-+		mdrestore repair rtcp m4 man doc po debian build
- 
--default: $(CONFIGURE)
-+SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
-+
-+default: include/builddefs include/platform_defs.h
- ifeq ($(HAVE_BUILDDEFS), no)
- 	$(MAKE) -C . $@
- else
--	$(SUBDIRS_MAKERULE)
-+	$(MAKE) $(SUBDIRS)
- endif
- 
-+# tool/lib dependencies
-+libxcmd: include
-+copy mdrestore: libxfs
-+db logprint: libxfs libxlog
-+growfs: libxfs libxcmd
-+io: libxcmd libhandle
-+mkfs: libxfs libdisk
-+quota: libxcmd
-+repair: libxfs libxlog
-+
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
- else
- clean:	# if configure hasn't run, nothing to clean
- endif
- 
--$(CONFIGURE):
-+include/builddefs:
- 	autoconf
- 	./configure \
- 		--prefix=/ \
-@@ -48,16 +60,27 @@ $(CONFIGURE):
- 		$$LOCAL_CONFIGURE_OPTIONS
- 	touch .census
- 
-+include/platform_defs.h: include/builddefs
-+## Recover from the removal of $@
-+	@if test -f $@; then :; else \
-+		rm -f include/builddefs; \
-+		$(MAKE) $(AM_MAKEFLAGS) include/builddefs; \
-+	fi
-+
- aclocal.m4::
- 	aclocal --acdir=`pwd`/m4 --output=$@
- 
--install: default
--	$(SUBDIRS_MAKERULE)
-+install: default $(addsuffix -install,$(SUBDIRS))
- 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- 	$(INSTALL) -m 644 README $(PKG_DOC_DIR)
- 
--install-dev: default
--	$(SUBDIRS_MAKERULE)
-+install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
-+
-+%-install:
-+	$(MAKE) -C $* install
-+
-+%-install-dev:
-+	$(MAKE) -C $* install-dev
- 
- realclean distclean: clean
- 	rm -f $(LDIRT) $(CONFIGURE)
-Index: xfs-cmds/xfsprogs/include/buildrules
-===================================================================
---- xfs-cmds.orig/xfsprogs/include/buildrules
-+++ xfs-cmds/xfsprogs/include/buildrules
-@@ -6,16 +6,19 @@ _BUILDRULES_INCLUDED_ = 1
- 
- include $(TOPDIR)/include/builddefs
- 
--clean clobber : $(SUBDIRS)
-+clean clobber : $(addsuffix -clean,$(SUBDIRS))
- 	rm -f $(DIRT)
- 	@rm -fr .libs
--	$(SUBDIRS_MAKERULE)
-+%-clean:
-+	$(MAKE) -C $* clean
- 
- # Never blow away subdirs
- ifdef SUBDIRS
- .PRECIOUS: $(SUBDIRS)
-+.PHONY: $(SUBDIRS)
-+
- $(SUBDIRS):
--	$(SUBDIRS_MAKERULE)
-+	$(MAKE) -C $@
- endif
- 
- #
-@@ -69,11 +72,13 @@ ifdef LTLIBRARY
- DEPENDSCRIPT := $(DEPENDSCRIPT) | $(SED) -e 's,^\([^:]*\)\.o,\1.lo,'
- endif
- 
--depend : $(CFILES) $(HFILES)
--	$(SUBDIRS_MAKERULE)
-+depend : $(CFILES) $(HFILES) $(addsuffix -depend,$(SUBDIRS))
- 	$(DEPENDSCRIPT) > .dep
- 	test -s .dep || rm -f .dep
- 
-+%-depend:
-+	$(MAKE) -C $* depend
-+
- # Include dep, but only if it exists
- ifeq ($(shell test -f .dep && echo .dep), .dep)
- include .dep
-Index: xfs-cmds/xfsprogs/include/buildmacros
-===================================================================
---- xfs-cmds.orig/xfsprogs/include/buildmacros
-+++ xfs-cmds/xfsprogs/include/buildmacros
-@@ -123,14 +123,6 @@ INSTALL_LINGUAS = \
- 	done
- endif
- 
--SUBDIRS_MAKERULE = \
--	@for d in $(SUBDIRS) ""; do \
--		if test -d "$$d" -a ! -z "$$d"; then \
--			$(ECHO) === $$d ===; \
--			$(MAKEF) -C $$d $@ || exit $$?; \
--		fi; \
--	done
--
- MAN_MAKERULE = \
- 	@for f in *.[12345678] ""; do \
- 		if test ! -z "$$f"; then \
-Index: xfs-cmds/xfsprogs/man/Makefile
-===================================================================
---- xfs-cmds.orig/xfsprogs/man/Makefile
-+++ xfs-cmds/xfsprogs/man/Makefile
-@@ -7,7 +7,16 @@ include $(TOPDIR)/include/builddefs
- 
- SUBDIRS = man3 man5 man8
- 
--default install install-dev : $(SUBDIRS)
--	$(SUBDIRS_MAKERULE)
-+default : $(SUBDIRS)
-+
-+install : $(addsuffix -install,$(SUBDIRS))
-+
-+install-dev : $(addsuffix -install-dev,$(SUBDIRS))
-+
-+%-install:
-+	$(MAKE) -C $* install
-+
-+%-install-dev:
-+	$(MAKE) -C $* install-dev
- 
- include $(BUILDRULES)
-
-_______________________________________________
-xfs mailing list
-xfs@oss.sgi.com
-http://oss.sgi.com/mailman/listinfo/xfs
-
-

xfsprogs-2.10.1-ustat.patch

@@ -1,49 +0,0 @@
-Linux kernels (at least up until 2.6.27) are lacking compat sys_ustat
-handlers on some platforms (notably PPC) so that if called from 32 bits
-on a 64-bit kernel, the kernel will copy out too much (32 bytes onto a
-20-byte structure):
-
-[root@xero xfstests]# xfs_logprint /dev/loop0
-xfs_logprint:
-*** stack smashing detected ***: xfs_logprint terminated
-Aborted
-
-This will be fixed upstream, but for the benefit of older kernels we
-may want to guard against this by padding the structure we pass into
-the syscall.   We don't care about the values anyway, just the return
-value.
-
-Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
----
-
-Index: xfs-cmds/xfsprogs/libxfs/linux.c
-===================================================================
---- xfs-cmds.orig/xfsprogs/libxfs/linux.c
-+++ xfs-cmds/xfsprogs/libxfs/linux.c
-@@ -49,7 +49,8 @@ static int max_block_alignment;
- int
- platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
- {
--	struct ustat	ust;
-+	/* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
-+	struct ustat	ust[2];
- 	struct stat64	st;
- 
- 	if (!s) {
-@@ -60,7 +61,7 @@ platform_check_ismounted(char *name, cha
- 		s = &st;
- 	}
- 
--	if (ustat(s->st_rdev, &ust) >= 0) {
-+	if (ustat(s->st_rdev, ust) >= 0) {
- 		if (verbose)
- 			fprintf(stderr,
- 				_("%s: %s contains a mounted filesystem\n"),
-
-
-_______________________________________________
-xfs mailing list
-xfs@oss.sgi.com
-http://oss.sgi.com/mailman/listinfo/xfs
-
-

xfsprogs-wrapper.h

@@ -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(__sparc64__)
-#include "platform_defs-sparc.h"
-#else
-#error "This xfsprogs-devel package does not work your architecture?"
-#endif

xfsprogs.spec

@@ -1,26 +1,21 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	2.10.1
+Version:	5.1.0
-Release:	3%{?dist}
+Release:	2%{?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
-# but no mention of versions in the source.
 License:	GPL+ and LGPLv2+
-Group:		System Environment/Base
+URL:		https://xfs.wiki.kernel.org
-URL:		http://oss.sgi.com/projects/xfs/
+Source0:	http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
-Source0:	ftp://oss.sgi.com/projects/xfs/cmd_tars/%{name}_%{version}-1.tar.gz
+Requires:	util-linux
-Source1:	xfsprogs-wrapper.h
+BuildRequires:	gcc
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libtool, gettext, libattr-devel, libuuid-devel
-BuildRequires:	libtool, gettext
+BuildRequires:	readline-devel, libblkid-devel >= 2.17-0.1.git5e51568
-BuildRequires:	e2fsprogs-devel
+Buildrequires:	lvm2-devel, libicu-devel >= 4.6
 Provides:	xfs-cmds
 Obsoletes:	xfs-cmds <= %{version}
-Conflicts:	xfsdump < 2.0.0
+Provides:	xfsprogs-qa-devel
-
+Obsoletes:	xfsprogs-qa-devel <= %{version}
-Patch0:		xfsprogs-2.10.1-parallel-build.patch
+Conflicts:	xfsdump < 3.0.1
-Patch1:		xfsprogs-libdisk-gfs2.patch
+Suggests:	xfsprogs-xfs_scrub
-Patch2:		xfsprogs-2.10.1-ustat.patch
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -32,249 +27,222 @@ variable block sizes, is extent based, and makes extensive use of
 Btrees (directories, extents, free space) to aid both performance
 and scalability.
 
-Refer to the documentation at http://oss.sgi.com/projects/xfs/
+This implementation is on-disk compatible with the IRIX version
-for complete details.  This implementation is on-disk compatible
+of XFS.
-with the IRIX version of XFS.
 
 %package devel
-Summary: XFS filesystem-specific static libraries and headers
+Summary: XFS filesystem-specific headers
-Group: Development/Libraries
+Requires: xfsprogs = %{version}-%{release}, libuuid-devel
-Requires: xfsprogs = %{version}-%{release}
 
 %description devel
-xfsprogs-devel contains the libraries and header files needed to
+xfsprogs-devel contains the header files needed to develop XFS
-develop XFS filesystem-specific programs.
+filesystem-specific programs.
 
 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 xfs_scrub
+Summary: XFS filesystem online scrubbing utilities
+Requires: xfsprogs = %{version}-%{release}, python3
+
+%description xfs_scrub
+xfs_scrub attempts to check and repair all metadata in a mounted XFS filesystem.
+WARNING!  This program is EXPERIMENTAL, which means that its behavior and
+interface could change at any time!
+
 %prep
 %setup -q
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
 
 %build
-# xfsprogs abuses libexecdir
+export tagname=CC
-export tagname=CC DEBUG=-DNDEBUG
 
 %configure \
-        --sbindir=/sbin         \
+        --enable-readline=yes	\
-        --libdir=/%{_lib}       \
+	--enable-blkid=yes	\
-        --libexecdir=%{_libdir} \
+	--enable-lto=no
-        --bindir=%{_sbindir}
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+make 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}
+rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.{la,a}}
-# fix up symlink to be correct
+
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
-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:
-%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
-
-%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
+%ldconfig_scriptlets
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%doc doc/CHANGES README
-%doc doc/CHANGES doc/COPYING doc/CREDITS doc/PORTING README
+%{_libdir}/*.so.*
-/sbin/fsck.xfs
+%dir %{_usr}/%{_lib}/xfsprogs
-/sbin/mkfs.xfs
+%{_usr}/%{_lib}/xfsprogs/*
-/sbin/xfs_repair
-/%{_lib}/*.so.*
-%{_mandir}/man8/*
 %{_mandir}/man5/*
+%{_mandir}/man8/*
 %{_sbindir}/*
+%{_unitdir}/*
+%exclude %{_sbindir}/xfs_scrub*
+%exclude %{_mandir}/man8/xfs_scrub*
+%exclude %{_usr}/%{_lib}/xfsprogs/xfs_scrub*
+%exclude %{_mandir}/man8/xfs_scrub_all*
+%exclude %{_unitdir}/xfs_scrub*
+
+%files xfs_scrub
+%{_sbindir}/xfs_scrub*
+%{_mandir}/man8/xfs_scrub*
+%{_usr}/%{_lib}/xfsprogs/xfs_scrub*
+%{_mandir}/man8/xfs_scrub_all*
+%{_unitdir}/xfs_scrub*
 
 %files devel
-%defattr(-,root,root)
+%{_mandir}/man2/*
 %{_mandir}/man3/*
-%{_includedir}/disk
+%dir %{_includedir}/xfs
-%{_includedir}/xfs
+%{_includedir}/xfs/handle.h
-%{_libdir}/*.a
+%{_includedir}/xfs/jdm.h
+%{_includedir}/xfs/linux.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
 
 %changelog
-* Wed Nov 26 2008 Eric Sandeen <sandeen@redhat.com> 2.10.1-3
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-2
-- Add protection from borken sys_ustat
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-- Add final upstream versions of gfs2 & parallel build patches
 
-* Wed Nov 12 2008 Eric Sandeen <sandeen@redhat.com> 2.10.1-2
+* Fri Jul 19 2019 Eric Sandeen <sandeen@redhat.com> 5.1.0-1
-- Recognize gfs/gfs2 in libdisk
+- New upstream release
-- Enable parallel builds
 
-* Fri Sep 05 2008 Eric Sandeen <sandeen@redhat.com> 2.10.1-1
+* Wed May 08 2019 Eric Sandeen <sandeen@redhat.com> 5.0.0-2
-- Update to xfsprogs 2.10.1
+- Create new xfs_scrub subpackage (#1666839)
-- Add ASCII case-insensitive support to xfsprogs.
-- xfs_repair fixes
 
-* Wed Jun 04 2008 Dennis Gilmore <dennis@ausil.us> 2.9.8-3
+* Fri May 03 2019 Eric Sandeen <sandeen@redhat.com> 5.0.0-1
-- sparc32 is built using the sparcv9 variant 
+- New upstream release
 
-* Wed Jun 04 2008 Eric Sandeen <sandeen@redhat.com> 2.9.8-2
+* Fri Feb 22 2019 Eric Sandeen <sandeen@redhat.com> 4.20.0-1
-- Tidy up multilib hack for non-multilib arches & add sparc (#448452)
+- New upstream release
 
-* Wed Apr 23 2008 Eric Sandeen <sandeen@redhat.com> 2.9.8-1
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.19.0-4
-- Update to xfsprogs 2.9.8
+- Rebuild for readline 8.0
-- Add support for sb_features2 in wrong location
-- Add -c option to xfs_admin to turn lazy-counters on/off
-- Added support for mdp in libdisk/mkfs.xfs
 
-* Sun Mar 02 2008 Eric Sandeen <sandeen@redhat.com> 2.9.7-1
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.0-3
-- Update to xfsprogs 2.9.7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-- Lazy sb counters back off by default; other misc fixes
 
-* Wed Feb 06 2008 Eric Sandeen <sandeen@redhat.com> 2.9.6-1
+* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 4.19.0-2
-- Update to xfsprogs 2.9.6 - fixes mkfs sizing problem.
+- Rebuild for ICU 63
-- Trim down BuildRequires to what's actually required now
 
-* Mon Jan 21 2008 Eric Sandeen <sandeen@redhat.com> 2.9.5-1
+* Tue Nov 13 2018 Eric Sandeen <sandeen@redhat.com> 4.19.0-1
-- Update to xfsprogs 2.9.5
+- New upstream release
-- Contains more optimal mkfs defaults
-- specfile cleanup, & don't restate config defaults
 
-* Tue Oct 23 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-4
+* Fri Aug 24 2018 Eric Sandeen <sandeen@redhat.com> 4.18.0-1
-- Add arm to multilib header wrapper
+- New upstream release
 
-* Tue Oct 02 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-3
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.17.0-3
-- mkfs.xfs: Fix wiping old AG headers and purge whack buffers
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Mon Oct 01 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-2
+* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 4.17.0-2
-- Add alpha to the multilib wrapper (#310411)
+- Rebuild for ICU 62
 
-* Mon Sep 10 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-1
+* Thu Jun 28 2018 Eric Sandeen <sandeen@redhat.com> 4.17.0-1
-- Update to xfsprogs 2.9.4
+- New upstream release
 
-* Fri Aug 24 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-3
+* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 4.16.0-2
-- Add gawk to buildrequires
+- Rebuild for ICU 61.1
 
-* Thu Aug 16 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-2
+* Thu Apr 26 2018 Eric Sandeen <sandeen@redhat.com> 4.16.0-1
-- Update license tag
+- New upstream release
+- Clean up specfile
 
-* Thu Jul 26 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-1
+* Mon Feb 26 2018 Eric Sandeen <sandeen@redhat.com> 4.15.1-1
-- Upgrade to xfsprogs 2.9.2, quota, xfs_repair, and filestreams changes
+- New upstream release
+- Update Polish translation
 
-* Thu Jul  6 2007 Eric Sandeen <sandeen@redhat.com> 2.8.21-1
+* Mon Feb 26 2018 Eric Sandeen <sandeen@redhat.com> 4.15.0-2
-- Upgrade to xfsprogs 2.8.21, lazy sb counters enabled,
+- BuildRequires: gcc
-  xfs_quota fix (#236746)
 
-* Thu May 31 2007 Eric Sandeen <sandeen@redhat.com> 2.8.20-2
+* Sat Feb 24 2018 Eric Sandeen <sandeen@redhat.com> 4.15.0-1
-- Fix ppc64 build... again
+- New upstream release
+- Adds new xfs_scrub utility and services
 
-* Fri May 25 2007 Eric Sandeen <sandeen@redhat.com> 2.8.20-1
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.0-2
-- Upgrade to xfsprogs 2.8.20, several xfs_repair fixes
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Tue Mar 06 2007 Miroslav Lichvar <mlichvar@redhat.com> 2.8.18-3
+* Mon Nov 27 2017 Eric Sandeen <sandeen@redhat.com> 4.14.0-1
-- Remove libtermcap-devel from BuildRequires
+- New upstream release
 
-* Wed Feb 14 2007 Miroslav Lichvar <mlichvar@redhat.com> 2.8.18-2
+* Wed Sep 27 2017 Eric Sandeen <sandeen@redhat.com> 4.13.1-1
-- Disable readline support for now (#223781)
+- New upstream release
+- Trim ancient changelog
 
-* Sun Feb 04 2007 Jarod Wilson <jwilson@redhat.com> 2.8.18-1
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.0-4
-- Post-facto changelog addition to note bump to 2.8.18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
-* Wed Sep 27 2006 Russell Cattelan <cattelan@thebarn.com> 2.8.11-3
+* Sun Jul 30 2017 Florian Weimer <fweimer@redhat.com> - 4.12.0-3
-- bump build version to 3 for a new brew build
+- Rebuild with binutils fix for ppc64le (#1475636)
 
-* Tue Sep 26 2006 Russell Cattelan <cattelan@thebarn.com> 2.8.11-2
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.0-2
-- add ppc64 build patch
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
-* Thu Sep 21 2006 Russell Cattelan <cattelan@redhat.com> 2.8.11-1
+* Mon Jul 24 2017 Eric Sandeen <sandeen@redhat.com> 4.12.0-1
-- Upgrade to xfsprogs 2.8.11 Need to pick up important repair fixes
+- New upstream release
 
-* Tue Jul 18 2006 Jeremy Katz <katzj@redhat.com> - 2.8.4-3
+* Fri May 05 2017 Eric Sandeen <sandeen@redhat.com> 4.11.0-1
-- exclude arch ppc64 for now (#199315)
+- New upstream release
 
-* Mon Jul 17 2006 Jesse Keating <jkeating@redhat.com> - 2.8.4-2
+* Sun Feb 26 2017 Eric Sandeen <sandeen@redhat.com> 4.10.0-1
-- rebuild
+- New upstream release
 
-* Tue Jul 04 2006 Robert Scheck <redhat@linuxnetz.de> 2.8.4-1
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0-3
-- Upgrade to 2.8.4 (#196599 #c2)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
-* Sun Jun 25 2006 Robert Scheck <redhat@linuxnetz.de> 2.8.3-1
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 4.9.0-2
-- Upgrade to 2.8.3 (#196599)
+- Rebuild for readline 7.x
-- 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
+* Thu Jan 05 2017 Eric Sandeen <sandeen@redhat.com> 4.9.0-1
-- Fixed multilib conflict of xfs/platform_defs.h (#192755)
+- New upstream release
 
-* Sun Mar 12 2006 Robert Scheck <redhat@linuxnetz.de> 2.7.11-1
+* Tue Oct 18 2016 Eric Sandeen <sandeen@redhat.com> 4.8.0-1
-- Upgrade to 2.7.11 and spec file cleanup (#185234)
+- New upstream release
 
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.7.3-1.2.1
+* Tue Sep 06 2016 Eric Sandeen <sandeen@redhat.com> 4.7.0-2
-- bump again for double-long bug on ppc(64)
+- Add libattr-devel build dependency to fix xfs_fsr
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.7.3-1.2
+* Sun Sep 04 2016 Eric Sandeen <sandeen@redhat.com> 4.7.0-1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+- New upstream release
 
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+* Tue Mar 15 2016 Eric Sandeen <sandeen@redhat.com> 4.5.0-1
-- rebuilt
+- New upstream release
 
-* Mon Oct 31 2005 Robert Scheck <redhat@linuxnetz.de> 2.7.3-1
+* Thu Mar 10 2016 Eric Sandeen <sandeen@redhat.com> 4.3.0-3
-- Upgrade to 2.7.3 and enabled termcap support (#154323)
+- Fix build w/ new kernels which have [sg]etxattr promotion
 
-* Wed Sep 28 2005 Florian La Roche <laroche@redhat.com>
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-2
-- fixup building with current rpm
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
-* Wed Apr 20 2005 Dave Jones <davej@redhat.com>
+* Mon Nov 30 2015 Eric Sandeen <sandeen@redhat.com> 4.3.0-1
-- Disable debug. (#151438)
+- New upstream release
-- Rebuild with gcc4
 
-* Wed Jan 12 2005 Tim Waugh <twaugh@redhat.com> - 2.6.13-3
+* Wed Sep 09 2015 Eric Sandeen <sandeen@redhat.com> 4.2.0-1
-- Rebuilt for new readline.
+- New upstream release
 
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+* Thu Jul 30 2015 Eric Sandeen <sandeen@redhat.com> 3.2.4-1
-- rebuilt
+- New upstream release
+- Addresses CVE-2012-2150 for xfs_metadump
 
-* Wed May  5 2004 Jeremy Katz <katzj@redhat.com> - 2.6.13-1
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.3-2
-- update to 2.6.13 per request of upstream
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-- fixes mount by label of xfs on former raid partition (#122043)
 
-* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+* Wed Jun 10 2015 Eric Sandeen <sandeen@redhat.com> 3.2.3-1
-- rebuilt
+- New upstream release
-
-* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Thu Jan  8 2004 Jeremy Katz <katzj@redhat.com> 2.6.0-2
-- add defattr (reported by Matthias)
-
-* Tue Dec 23 2003 Elliot Lee <sopwith@redhat.com> 2.6.0-3
-- Fix tyops in dependencies
-
-* Mon Dec 22 2003 Jeremy Katz <katzj@redhat.com> 2.6.0-1
-- build for Fedora Core
-- switch to more explicit file lists, nuke .la files
-
-* Tue Dec 16 2003 Axel Thimm <Axel.Thimm@physik.fu-berlin.de> 2.6.0
-- Update to 2.6.0.
-
-* Sat Sep 13 2003 Axel Thimm <Axel.Thimm@physik.fu-berlin.de>
-- Sync with XFS 1.3.0.
-- Update to 2.5.6.
-
-* Thu Apr 10 2003 Axel Thimm <Axel.Thimm@physik.fu-berlin.de> 2.3.9-0_2.90at
-- Rebuilt for Red Hat 9.