Sync changes to SLFO-1.2 branch

xfsprogs-docdir.diff

@@ -1,8 +1,8 @@
-Index: xfsprogs-6.7.0/include/builddefs.in
-===================================================================
---- xfsprogs-6.7.0.orig/include/builddefs.in
-+++ xfsprogs-6.7.0/include/builddefs.in
-@@ -55,7 +55,7 @@ PKG_LIBEXEC_DIR	= @libexecdir@/@pkg_name
+diff --git a/include/builddefs.in b/include/builddefs.in
+index 0bb364310d78..07775ac2d5e7 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -54,7 +54,7 @@ PKG_LIB_DIR	= @libdir@@libdirsuffix@
  PKG_INC_DIR	= @includedir@/xfs
  DK_INC_DIR	= @includedir@/disk
  PKG_MAN_DIR	= @mandir@

xfsprogs.changes

@@ -33,8 +33,8 @@ Wed Jun 25 09:37:08 UTC 2025 - Anthony Iliopoulos <ailiop@suse.com>
   - xfs_io: catch statx fields up to 6.15
   - man: fix missing cachestat manpage
 
- -------------------------------------------------------------------
-Mon Apr 14 18:00:22 UTC 2025 - Anthony Iliopoulos <ailiop@suse.com>
+-------------------------------------------------------------------
+Wed Jun 11 19:40:41 UTC 2025 - Anthony Iliopoulos <ailiop@suse.com>
 
 - update to 6.14.0
   - xfs_scrub_all: localize the strings in the program
@@ -123,12 +123,7 @@ Mon Apr 14 18:00:22 UTC 2025 - Anthony Iliopoulos <ailiop@suse.com>
   - mkfs,xfs_repair: don't pass a daddr as the flags argument
 
 - drop mkfs-fix-filesize-function-compilation-error-on-32-b.patch
-  The fix is now included in the v6.14.0 release.
-
--------------------------------------------------------------------
-Sat Mar  1 10:03:41 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Modernize specfile: remove implicit %defattr, trim -n arguments
+  - now part of the release (merged in v6.14.0)
 
 -------------------------------------------------------------------
 Tue Feb 18 14:56:17 UTC 2025 - Anthony Iliopoulos <ailiop@suse.com>

xfsprogs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xfsprogs
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -98,12 +98,12 @@ You should install xfsprogs-devel if you want to develop XFS file
 system-specific programs.  If you install xfsprogs-devel, you will also
 want to install xfsprogs.
 
-%package scrub
+%package -n	xfsprogs-scrub
 Summary:        XFS scrubbing scripts and service files
 Group:          System/Filesystems
 Requires:       xfsprogs
 
-%description scrub
+%description -n	xfsprogs-scrub
 Scripts and systemd service files for background scrubbing of metadata
 on xfs filesystems.
 
@@ -146,16 +146,16 @@ install -m 0755 module-setup.sh %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
 install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
 
 %if %{with systemd}
-%pre scrub
+%pre -n xfsprogs-scrub
 %service_add_pre xfs_scrub_all.service xfs_scrub_all.timer
 
-%post scrub
+%post -n xfsprogs-scrub
 %service_add_post xfs_scrub_all.service xfs_scrub_all.timer
 
-%preun scrub
+%preun -n xfsprogs-scrub
 %service_del_preun xfs_scrub_all.service xfs_scrub_all.timer
 
-%postun scrub
+%postun -n xfsprogs-scrub
 %service_del_postun xfs_scrub_all.service xfs_scrub_all.timer
 %endif
 
@@ -171,6 +171,7 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
 %{?regenerate_initrd_posttrans}
 
 %files -f %{name}.lang
+%defattr(-,root,root,755)
 %{_sbindir}/*
 %exclude %{_sbindir}/xfs_scrub_all
 %{_mandir}/man[258]/*
@@ -191,14 +192,17 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
 %{_prefix}/share/xfsprogs/mkfs/*
 
 %files -n %{libname}
+%defattr(-,root,root,755)
 %{_libdir}/libhandle.so.*
 
-%files devel
+%files -n xfsprogs-devel
+%defattr(-,root,root,755)
 %{_includedir}/xfs
 %{_libdir}/libhandle.so
 %{_mandir}/man3/*
 
-%files scrub
+%files -n xfsprogs-scrub
+%defattr(-,root,root,755)
 %dir %{_libexecdir}/xfsprogs
 %{_prefix}/share/xfsprogs/xfs_scrub_all.cron
 %{_sbindir}/xfs_scrub_all