diff --git a/.gitignore b/.gitignore index ed6957c..792648b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xfsprogs-6.5.0.tar.xz +SOURCES/xfsprogs-6.11.0.tar.xz diff --git a/.xfsprogs.metadata b/.xfsprogs.metadata index 7abe23d..0b2d3e6 100644 --- a/.xfsprogs.metadata +++ b/.xfsprogs.metadata @@ -1 +1 @@ -d6f99518d6c88994d7d4cad318b67cb69bc4ddfa SOURCES/xfsprogs-6.5.0.tar.xz +13f1c9ec9d5da9cf453395100c303271094f2638 SOURCES/xfsprogs-6.11.0.tar.xz diff --git a/SOURCES/46A7EA18AC33E108.asc b/SOURCES/46A7EA18AC33E108.asc new file mode 100644 index 0000000..71a5fc7 --- /dev/null +++ b/SOURCES/46A7EA18AC33E108.asc @@ -0,0 +1,43 @@ +pub ed25519 2024-07-30 [SC] + AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 +uid Andrey Albershteyn (kernel.org) +sub cv25519 2024-07-30 [E] + 6970FDF6D1E4238DD1F646DB321F8D8C374A9F36 + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +1OmvS52Zk7eABR0apAi2szMSpYNJmmFITK8sAg== +=lNIZ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/SOURCES/xfsprogs-6.11.0.tar.sign b/SOURCES/xfsprogs-6.11.0.tar.sign new file mode 100644 index 0000000..1c84373 --- /dev/null +++ b/SOURCES/xfsprogs-6.11.0.tar.sign @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iIoEABYKADIWIQSuGyqVYnIab8QwfB9Gp+oYrDPhCAUCZxOEKBQcYWFsYmVyc2hA +cmVkaGF0LmNvbQAKCRBGp+oYrDPhCMtLAP4niNMOwC07QrHPPQTl3QfJE96p+JeE +98D8Kx3UFSVxWQD9ECBKCND6huTZCTK6FchwWANglXgrtF4dEq0kxlOJLQE= +=rMkp +-----END PGP SIGNATURE----- diff --git a/SOURCES/xfsprogs-6.5.0.tar.sign b/SOURCES/xfsprogs-6.5.0.tar.sign deleted file mode 100644 index 5ea085d..0000000 --- a/SOURCES/xfsprogs-6.5.0.tar.sign +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iIUEABYIAC0WIQT6QG4gav94c4l8aGS0VhjDaiT9IwUCZSfZXQ8cY2VtQGtlcm5l -bC5vcmcACgkQtFYYw2ok/SOFogD+MZ4LooqWPZ9aNEfw/GEtiJJzlVMwYHFcgqDK -xgilyusBAKOZeJc4SiFarTv2PnIRuMDxhwaFm0Sy+ngiFn0whlED -=k6/7 ------END PGP SIGNATURE----- diff --git a/SPECS/xfsprogs.spec b/SPECS/xfsprogs.spec index cb97e72..a8e5778 100644 --- a/SPECS/xfsprogs.spec +++ b/SPECS/xfsprogs.spec @@ -1,12 +1,13 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs -Version: 6.5.0 -Release: 5%{?dist} +Version: 6.11.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 Source1: http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.sign Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/13F703E6C11CF6F0.asc +Source3: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/46A7EA18AC33E108.asc BuildRequires: make BuildRequires: gcc @@ -21,6 +22,14 @@ Obsoletes: xfsprogs-qa-devel <= %{version} Conflicts: xfsdump < 3.0.1 Suggests: xfsprogs-xfs_scrub +%if "%{_sbindir}" == "%{_bindir}" +# Compat symlinks for Requires in other packages. +# We rely on filesystem to create the symlinks for us. +Requires: filesystem(unmerged-sbin-symlinks) +Provides: /usr/sbin/fsck.xfs +Provides: /usr/sbin/mkfs.xfs +%endif + %description A set of commands to use the XFS filesystem, including mkfs.xfs. @@ -57,7 +66,7 @@ WARNING! This program is EXPERIMENTAL, which means that its behavior and interface could change at any time! %prep -xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- +xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE3}' --signature='%{SOURCE1}' --data=- %autosetup -p1 %build @@ -87,25 +96,29 @@ 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 +%dir %{_datadir}/xfsprogs/ +%dir %{_datadir}/xfsprogs/mkfs/ +%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 +140,18 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/ %{_libdir}/*.so %changelog +* Sat Nov 16 2024 Pavel Reichl - 6.11.0-1 +- Update to the latest upstream version +- Related: rhbz#2319902 + +* Sat Nov 16 2024 Pavel Reichl - 6.6.0-2 +- Add missing directories to RPM database +- Related: rhbz#2279737 + +* Sat Nov 16 2024 Pavel Reichl - 6.6.0-1 +- Rebase to upstream version 6.6.0 +- Related: rhbz#2262783 + * Tue Oct 29 2024 Troy Dawson - 6.5.0-5 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018