Rebase to upstream version 6.6.0

Changes were made to the installation paths of certain files upstream.
For more information, refer to the following commits:

  * e0cb10f5f8fc xfs_scrub_fail: move executable script to /usr/libexec
  * 3d37d8bf535f xfs_scrub_all.cron: move to package data directory

Resolves: rhbz#2262783
Signed-off-by: Pavel Reichl <preichl@redhat.com>
(cherry picked from commit bb45d3c8fee04e16e6f254d6ed4192c9f8fc8c25)
This commit is contained in:
Pavel Reichl 2024-02-23 00:50:25 +01:00
parent 4016ad60bc
commit 7014dc29b0
3 changed files with 16 additions and 8 deletions

2
.gitignore vendored
View File

@ -81,3 +81,5 @@ xfsprogs-3.1.2.tar.gz
/xfsprogs-6.4.0.tar.xz
/xfsprogs-6.5.0.tar.xz
/xfsprogs-6.5.0.tar.sign
/xfsprogs-6.6.0.tar.sign
/xfsprogs-6.6.0.tar.xz

View File

@ -1,2 +1,2 @@
SHA512 (xfsprogs-6.5.0.tar.xz) = 0a2db9c3df8209b2b6d264b7ef87f4c101f5129dfa14cb09159dbef181c09508fa8460eb1f4293300f24696ce236ca49065e47068cebdee00ee8ab9e2b75211c
SHA512 (xfsprogs-6.5.0.tar.sign) = 3fb361d2df3fbbeb766482787bcb673fa0578e7acee65c96f2f250fbb8cff2feed2b12afd8d33533c51adbecc63bffac14fdc12cc60b6f84b04362f6faebe8b0
SHA512 (xfsprogs-6.6.0.tar.sign) = 1b53624cfdc4fe8669b0709c43908145c98be6d6a17ea2863afde7bba1cacf74c539b8489cd96c24ee8ddf13822d67c5ff3ebe97071778aba4674443e7a3b3b2
SHA512 (xfsprogs-6.6.0.tar.xz) = 89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da

View File

@ -1,7 +1,7 @@
Summary: Utilities for managing the XFS filesystem
Name: xfsprogs
Version: 6.5.0
Release: 5%{?dist}
Version: 6.6.0
Release: 1%{?dist}
License: GPL-1.0-or-later AND LGPL-2.1-or-later
URL: https://xfs.wiki.kernel.org
Source0: http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
@ -87,25 +87,27 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
%files -f %{name}.lang
%doc doc/CHANGES README
%{_libdir}/*.so.*
%dir %{_usr}/%{_lib}/xfsprogs
%{_usr}/%{_lib}/xfsprogs/*
%dir %{_libexecdir}/xfsprogs
%{_libexecdir}/xfsprogs/*
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_sbindir}/*
%{_unitdir}/*
%{_datadir}/xfsprogs/mkfs/*.conf
%exclude %{_datadir}/xfsprogs/xfs_scrub_all.cron
%exclude %{_sbindir}/xfs_scrub*
%exclude %{_mandir}/man8/xfs_scrub*
%exclude %{_usr}/%{_lib}/xfsprogs/xfs_scrub*
%exclude %{_libexecdir}/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*
%{_libexecdir}/xfsprogs/xfs_scrub*
%{_unitdir}/xfs_scrub*
%{_udevrulesdir}/64-xfs.rules
%{_datadir}/xfsprogs/xfs_scrub_all.cron
%files devel
%{_mandir}/man2/*
@ -127,6 +129,10 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
%{_libdir}/*.so
%changelog
* Sat Nov 16 2024 Pavel Reichl <preichl@redhat.com> - 6.6.0-1
- Rebase to upstream version 6.6.0
- Related: rhbz#2262783
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.5.0-5
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018