.gitignore

@@ -30,10 +30,3 @@ 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
-/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

sources

@@ -1 +1 @@
-SHA512 (xfsprogs-5.1.0.tar.xz) = ca5959edb299be8574b2ca51e907a418fab796ae92f588075a2aab0c2a3cf8dae49e2b68679c65c361201223e8f8ac29b1e5618eb1e519496c3aca9218620881
+SHA512 (xfsprogs-4.15.1.tar.xz) = 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee

xfsprogs.spec

@@ -1,21 +1,24 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	5.1.0
+Version:	4.15.1
-Release:	2%{?dist}
+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
+# but no mention of versions in the source.
 License:	GPL+ and LGPLv2+
-URL:		https://xfs.wiki.kernel.org
+Group:		System Environment/Base
+URL:		http://oss.sgi.com/projects/xfs/
 Source0:	http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
-Requires:	util-linux
 BuildRequires:	gcc
 BuildRequires:	libtool, gettext, libattr-devel, libuuid-devel
 BuildRequires:	readline-devel, libblkid-devel >= 2.17-0.1.git5e51568
-Buildrequires:	lvm2-devel, libicu-devel >= 4.6
+Buildrequires:	libunistring-devel, lvm2-devel
 Provides:	xfs-cmds
 Obsoletes:	xfs-cmds <= %{version}
 Provides:	xfsprogs-qa-devel
 Obsoletes:	xfsprogs-qa-devel <= %{version}
 Conflicts:	xfsdump < 3.0.1
-Suggests:	xfsprogs-xfs_scrub
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -27,11 +30,13 @@ variable block sizes, is extent based, and makes extensive use of
 Btrees (directories, extents, free space) to aid both performance
 and scalability.
 
-This implementation is on-disk compatible with the IRIX version
+Refer to the documentation at http://oss.sgi.com/projects/xfs/
-of XFS.
+for complete details.  This implementation is on-disk compatible
+with the IRIX version of XFS.
 
 %package devel
 Summary: XFS filesystem-specific headers
+Group: Development/Libraries
 Requires: xfsprogs = %{version}-%{release}, libuuid-devel
 
 %description devel
@@ -42,44 +47,42 @@ 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
 
 %build
 export tagname=CC
-
 %configure \
         --enable-readline=yes	\
-	--enable-blkid=yes	\
+	--enable-blkid=yes
-	--enable-lto=no
 
-make %{?_smp_mflags}
+# 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}
 
 %install
-make DIST_ROOT=$RPM_BUILD_ROOT install install-dev \
+rm -rf $RPM_BUILD_ROOT
+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
 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/
 
 %find_lang %{name}
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%doc doc/CHANGES README
+%defattr(-,root,root)
+%doc doc/CHANGES doc/COPYING doc/CREDITS README
 %{_libdir}/*.so.*
 %dir %{_usr}/%{_lib}/xfsprogs
 %{_usr}/%{_lib}/xfsprogs/*
@@ -87,20 +90,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
 %{_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/*
 %dir %{_includedir}/xfs
@@ -119,52 +111,6 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
 %{_libdir}/*.so
 
 %changelog
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jul 19 2019 Eric Sandeen <sandeen@redhat.com> 5.1.0-1
-- New upstream release
-
-* Wed May 08 2019 Eric Sandeen <sandeen@redhat.com> 5.0.0-2
-- Create new xfs_scrub subpackage (#1666839)
-
-* Fri May 03 2019 Eric Sandeen <sandeen@redhat.com> 5.0.0-1
-- New upstream release
-
-* Fri Feb 22 2019 Eric Sandeen <sandeen@redhat.com> 4.20.0-1
-- New upstream release
-
-* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.19.0-4
-- Rebuild for readline 8.0
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 4.19.0-2
-- Rebuild for ICU 63
-
-* Tue Nov 13 2018 Eric Sandeen <sandeen@redhat.com> 4.19.0-1
-- New upstream release
-
-* Fri Aug 24 2018 Eric Sandeen <sandeen@redhat.com> 4.18.0-1
-- New upstream release
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.17.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 4.17.0-2
-- Rebuild for ICU 62
-
-* Thu Jun 28 2018 Eric Sandeen <sandeen@redhat.com> 4.17.0-1
-- New upstream release
-
-* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 4.16.0-2
-- Rebuild for ICU 61.1
-
-* 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