Sync from SUSE:SLFO:1.1 xfsprogs revision 0bb95b653692ab3eacd2c21198cb4ec5

mkfs-fix-filesize-function-compilation-error-on-32-b.patch

@@ -1,35 +0,0 @@
-From c849e53e4389da08901cef99a9d9dcd0cb4b0ef1 Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@suse.com>
-Date: Tue, 18 Feb 2025 15:06:29 +0100
-Subject: mkfs: fix filesize function compilation error on 32-bit archs
-
-Commit 73fb78e5ee89 changed the return type of filesize() from long to
-off_t, without changing the corresponding earlier declaration of the
-function.
-
-On 32-bit archs this breaks compilation as the off_t type is 8 bytes
-(since the unit is compiled with -D_FILE_OFFSET_BITS=64) and that is
-causing a conflicting type mismatch with the long type declaration.
-
-Fixes: 73fb78e5ee89 ("mkfs: support copying in large or sparse files")
-Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
----
- mkfs/proto.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkfs/proto.c b/mkfs/proto.c
-index 6dd3a2005b15..981f5b11567f 100644
---- a/mkfs/proto.c
-+++ b/mkfs/proto.c
-@@ -20,7 +20,7 @@ static struct xfs_trans * getres(struct xfs_mount *mp, uint blocks);
- static void rsvfile(xfs_mount_t *mp, xfs_inode_t *ip, long long len);
- static int newregfile(char **pp, char **fname);
- static void rtinit(xfs_mount_t *mp);
--static long filesize(int fd);
-+static off_t filesize(int fd);
- static int slashes_are_spaces;
- 
- /*
--- 
-2.47.0
-

xfsprogs-6.13.0.tar.sign

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iHUEABYKAB0WIQSuGyqVYnIab8QwfB9Gp+oYrDPhCAUCZ7MGkgAKCRBGp+oYrDPh
-CI6rAPwM0VNd2avdTbIAhrA6jGtn56QYFuHHgfe3RZ1hw5sa4AD9HBkJ2s/nKf+P
-9ogHdsycUNVktMTnFyVwDux1aYaUHwA=
-=6c15
------END PGP SIGNATURE-----

xfsprogs-6.5.0.tar.sign

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iIUEABYIAC0WIQT6QG4gav94c4l8aGS0VhjDaiT9IwUCZSfZXQ8cY2VtQGtlcm5l
+bC5vcmcACgkQtFYYw2ok/SOFogD+MZ4LooqWPZ9aNEfw/GEtiJJzlVMwYHFcgqDK
+xgilyusBAKOZeJc4SiFarTv2PnIRuMDxhwaFm0Sy+ngiFn0whlED
+=k6/7
+-----END PGP SIGNATURE-----

xfsprogs.changes

@@ -1,339 +1,5 @@
 -------------------------------------------------------------------
-Tue Feb 18 14:56:17 UTC 2025 - Anthony Iliopoulos <ailiop@suse.com>
+Fri Oct 13 15:04:01 UTC 2023 - Anthony Iliopoulos <ailiop@suse.com>
-
-- mkfs: fix filesize function compilation error on 32-bit archs
-  - add mkfs-fix-filesize-function-compilation-error-on-32-b.patch
-
--------------------------------------------------------------------
-Mon Feb 17 13:15:41 UTC 2025 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 6.13.0
-  - xfs_protofile: fix device number encoding
-  - xfs_protofile: fix mode formatting error
-  - mkfs: fix file size setting when interpreting a protofile
-  - xfs_repair: require zeroed quota/rt inodes in metadir superblocks
-  - mkfs: use a default sector size that is also suitable for the rtdev
-  - xfs_scrub_all.timer: don't run if /var/lib/xfsprogs is readonly
-  - xfs_logprint: Fix super block buffer interpretation issue
-  - mkfs: allow sizing realtime allocation groups for concurrency
-  - build: initialize stack variables to zero by default
-  - m4: fix statx override selection if /usr/include doesn't define it
-  - mkfs: fix parsing of value-less -d/-l concurrency cli option
-  - xfs_db: improve error message when unknown btree type given to btheight
-  - xfs_repair: don't obliterate return codes
-  - xfs_db: fix multiple dblock commands
-  - xfs: don't return an error from xfs_update_last_rtgroup_size for !XFS_RT
-  - xfs_io: add extsize command support
-  - xfs_io: allow foreign FSes to show FS_IOC_FSGETXATTR details
-  - mkfs: enable rt quota options
-  - xfs_quota: report warning limits for realtime space quotas
-  - mkfs: add quota flags when setting up filesystem
-  - xfs_repair: try not to trash qflags on metadir filesystems
-  - xfs_repair: support quota inodes in the metadata directory
-  - xfs_db: support metadir quotas
-  - libfrog: scrub quota file metapaths
-  - mkfs: format realtime groups
-  - mkfs: add headers to realtime bitmap blocks
-  - xfs_scrub: use histograms to speed up phase 8 on the realtime volume
-  - xfs_scrub: trim realtime volumes too
-  - xfs_scrub: call GETFSMAP for each rt group in parallel
-  - xfs_scrub: cleanup fsmap keys initialization
-  - xfs_scrub: check rtgroup metadata directory connections
-  - xfs_scrub: scrub realtime allocation group metadata
-  - xfs_spaceman: report on realtime group health
-  - xfs_mdrestore: restore rt group superblocks to realtime device
-  - xfs_io: display rt group in verbose fsmap output
-  - xfs_io: display rt group in verbose bmap output
-  - xfs_io: add a command to display realtime group information
-  - xfs_io: add a command to display allocation group information
-  - xfs_io: support scrubbing rtgroup metadata paths
-  - xfs_io: support scrubbing rtgroup metadata
-  - xfs_db: report rt group and block number in the bmap command
-  - xfs_db: dump rt summary blocks
-  - xfs_db: dump rt bitmap blocks
-  - xfs_db: metadump realtime devices
-  - xfs_db: metadump metadir rt bitmap and summary files
-  - xfs_db: enable conversion of rt space units
-  - xfs_db: support changing the label and uuid of rt superblocks
-  - xfs_db: support dumping realtime group data and superblocks
-  - xfs_db: listify the definition of enum typnm
-  - xfs_db: enable rtconvert to handle segmented rtblocks
-  - xfs_db: enable the rtblock and rtextent commands for segmented rt block numbers
-  - xfs_repair: repair rtbitmap and rtsummary block headers
-  - xfs_repair: support realtime superblocks
-  - xfs_repair: find and clobber rtgroup bitmap and summary files
-  - xfs_repair: support realtime groups
-  - xfs_repair: add a real per-AG bitmap abstraction
-  - xfs_repair: simplify rt_lock handling
-  - xfs_repair: improve rtbitmap discrepancy reporting
-  - xfs_repair: refactor offsetof+sizeof to offsetofend
-  - xfs_repair: refactor phase4
-  - xfs_repair: adjust rtbitmap/rtsummary word updates to handle big endian values
-  - xfs_logprint: report realtime EFIs
-  - libfrog: add bitmap_clear
-  - libfrog: report rt groups in output
-  - libfrog: support scrubbing rtgroup metadata paths
-  - man: document rgextents geom field
-  - man: document the rt group geometry ioctl
-  - mkfs: add a utility to generate protofiles
-  - mkfs: support copying in xattrs
-  - mkfs: support copying in large or sparse files
-  - mkfs.xfs: enable metadata directories
-  - xfs_repair: do not count metadata directory files when doing quotacheck
-  - xfs_repair: truncate and unmark orphaned metadata inodes
-  - xfs_repair: drop all the metadata directory files during pass 4
-  - xfs_repair: metadata dirs are never plausible root dirs
-  - xfs_repair: mark space used by metadata files
-  - xfs_repair: update incore metadata state whenever we create new files
-  - xfs_repair: don't let metadata and regular files mix
-  - xfs_repair: rebuild the metadata directory
-  - xfs_repair: check metadata inode flag
-  - xfs_repair: dont check metadata directory dirent inumbers
-  - xfs_repair: handle sb_metadirino correctly when zeroing supers
-  - xfs_scrub: re-run metafile scrubbers during phase 5
-  - xfs_scrub: scan metadata directories during phase 3
-  - xfs_scrub: tread zero-length read verify as an IO error
-  - xfs_spaceman: report health of metadir inodes too
-  - xfs_io: support scrubbing metadata directory paths
-  - xfs_io: support flag for limited bulkstat of the metadata directory
-  - xfs_db: drop the metadata checking code from blockget
-  - xfs_db: display di_metatype
-  - xfs_db: show the metadata root directory when dumping superblocks
-  - xfs_db: support metadata directories in the path command
-  - xfs_db: don't obfuscate metadata directories and attributes
-  - xfs_db: report metadir support for version command
-  - xfs_db: disable xfs_check when metadir is enabled
-  - xfs_io: support scrubbing metadata directory paths
-  - libfrog: report metadata directories in the geometry report
-  - man: update scrub ioctl documentation for metadir
-  - man2: document metadata directory flag in fsgeom ioctl
-  - man: document the -n parent mkfs option
-  - man: fix ioctl_xfs_commit_range man page install
-  - xfs_repair: fix maximum file offset comparison
-
-- update to 6.12.0
-  - xfs_io: add support for atomic write statx fields
-  - xfs_repair: fix crasher in pf_queuing_worker
-  - xfs: Reduce unnecessary searches when searching for the best extents
-  - xfs_spaceman: add dependency on libhandle target
-  - mkfs: add a config file for 6.12 LTS kernels
-  - xfs_scrub_all: wait for services to start activating
-  - xfs_repair: checking rt free space metadata must happen during phase 4
-  - xfs_db: allow setting current address to log blocks
-  - xfs_db: convert rtsummary geometry
-  - xfs_db: convert rtbitmap geometry
-  - xfs_db: enable conversion of rt space units
-  - xfs_db: access arbitrary realtime blocks and extents
-  - xfs_db: access realtime file blocks
-  - xfs_db: make the daddr command target the realtime device
-  - xfs_db: report the realtime device when associated with each io cursor
-  - xfs_db: support passing the realtime device to the debugger
-  - xfs_io: add atomic file update commands to exercise file commit range
-  - xfs_io: add a commitrange option to the exchangerange command
-  - xfs_fsr: port to new file exchange library function
-
- -------------------------------------------------------------------
-Sat Oct 19 11:09:09 UTC 2024 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 6.11.0
-  - mkfs: break up the rest of the rtinit() function
-  - mkfs: clean up the rtinit() function
-  - xfs_repair: use library functions for orphanage creation
-  - xfs_repair: use library functions to reset root/rbm/rsum inodes
-  - xfs_repair: don't crash in get_inode_parent
-  - xfs_repair: fix exchrange upgrade
-  - xfs_db: port the iunlink command to use the libxfs iunlink function
-  - xfs_db/mdrestore/repair: don't use the incore struct xfs_sb for offsets into struct xfs_dsb
-  - xfs_db/mkfs/xfs_repair: port to use XFS_ICREATE_UNLINKABLE
-  - xfs_db: port the unlink command to use libxfs_droplink
-  - libxfs: implement get_random_u32
-  - libxfs: remove libxfs_dir_ialloc
-  - libxfs: backport inode init code from the kernel
-  - libxfs: pack icreate initialization parameters into a separate structure
-  - xfs_io: add RWF_ATOMIC support to pwrite
-  - libfrog: emulate deprecated attrlist functionality in libattr
-  - misc: clean up code around attr_list_by_handle calls
-  - fsck.xfs: fix fsck.xfs run by different shells when fsck.mode=force is set
-  - libxfs: provide a memfd_create() wrapper if not present in libc
-  - xfs_io: Fix fscrypt macros ordering
-  - man: Update unit for fsx_extsize and fsx_cowextsize
-  - xfs_db: release ip resource before returning from get_next_unlinked()
-  - libxfs: kernel sync
-
- -------------------------------------------------------------------
-Wed Sep  4 11:33:31 UTC 2024 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 6.10.1
-  - fix C++ compilation errors in xfs_fs.h
-
- -------------------------------------------------------------------
-Mon Aug 26 10:13:27 UTC 2024 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 6.10.0
-  - debian: enable xfs_scrub_all systemd timer services by default
-  - mkfs: set autofsck filesystem property
-  - xfs_scrub: use the autofsck fsproperty to select mode
-  - xfs_scrub: allow sysadmin to control background scrubs
-  - xfs_property: add a new tool to administer fs properties
-  - xfs_db: add a command to list xattrs
-  - xfs_db: improve getting and setting extended attributes
-  - xfs_io: edit filesystem properties
-  - xfs_scrub: defer phase5 file scans if dirloop fails
-  - xfs_repair: wipe ondisk parent pointers when there are none
-  - xfs_scrub: detect and repair directory tree corruptions
-  - xfs_repair: update ondisk parent pointer records
-  - xfs_spaceman: report directory tree corruption in the health information
-  - xfsprogs: support vectored scrub
-  - man: document vectored scrub mode
-  - man2: update ioctl_xfs_scrub_metadata.2 for parent pointers
-  - mkfs: enable formatting with parent pointers
-  - mkfs: Add parent pointers during protofile creation
-  - xfs_repair: check parent pointers
-  - xfs_db: compute hashes of parent pointers
-  - xfs_db: add link and unlink expert commands
-  - xfs_repair: build a parent pointer index
-  - xfs_db: add a parents command to list the parents of a file
-  - xfs_db: obfuscate dirent and parent pointer names consistently
-  - xfs_db: report parent pointers embedded in xattrs
-  - xfs_db: report parent bit on xattrs
-  - xfs_db: report parent pointers in version command
-  - xfs_scrub: use parent pointers to report lost file data
-  - xfs_scrub: use parent pointers when possible to report file operations
-  - xfs_logprint: decode parent pointers in ATTRI items fully
-  - xfs_io: Add i, n and f flags to parent command
-  - xfs_io: adapt parent command to new parent pointer ioctls
-  - libfrog: report parent pointers to userspace
-  - libfrog: add parent pointer support code
-  - man: document the XFS_IOC_GETPARENTS ioctl
-  - xfs_logprint: dump new attr log item fields
-  - xfs_scrub_all: failure reporting for the xfs_scrub_all job
-  - xfs_repair: check free space requirements before allowing upgrades
-  - xfs_scrub_all: convert systemctl calls to dbus
-  - xfs_scrub_all: trigger automatic media scans once per month
-  - xfs_scrub: add an optimization-only mode
-  - xfs_scrub_all: add CLI option for easier debugging
-  - xfs_scrub_all: enable periodic file data scrubs automatically
-  - xfs_scrub: automatic downgrades to dry-run mode in service mode
-  - xfs_scrub_all: support metadata+media scans of all filesystems
-  - xfs_scrub_all: fail fast on masked units
-  - xfs_scrub_all: remove journalctl background process
-  - xfs_scrub_all: only use the xfs_scrub@ systemd services in service mode
-  - xfs_scrub: tune fstrim minlen parameter based on free space histograms
-  - xfs_scrub: improve responsiveness while trimming the filesystem
-  - xfs_scrub: tighten up the security on the background systemd service
-  - xfs_scrub: don't call FITRIM after runtime errors
-  - xfs_scrub: use dynamic users when running as a systemd service
-  - xfs_scrub: report FITRIM errors properly
-  - xfs_scrub.service: reduce background CPU usage to less than one core if possible
-  - xfs_scrub: don't close stdout when closing the progress bar
-  - xfs_scrub: fix the work estimation for phase 8
-  - libfrog: print cdf of free space buckets
-  - libfrog: print wider columns for free space histogram
-  - xfs_scrub: ignore phase 8 if the user disabled fstrim
-  - xfs_scrub: move FITRIM to phase 8
-  - xfs_scrub: improve thread scheduling repair items during phase 4
-  - xfs_scrub: avoid potential UAF after freeing a duplicate name entry
-  - xfs_scrub: enable users to bump information messages to warnings
-  - xfs_scrub: retry incomplete repairs
-  - xfs_scrub: warn about difficult repairs to rt and quota metadata
-  - xfs_scrub: any inconsistency in metadata should trigger difficulty warnings
-  - mkfs: add a formatting option for exchange-range
-  - xfs_repair: add exchange-range to file systems
-  - xfs_scrub: fix missing scrub coverage for broken inodes
-  - xfs_scrub: log when a repair was unnecessary
-  - libfrog: advertise exchange-range support
-  - xfs_io: create exchangerange command to test file range exchange ioctl
-  - xfs_fsr: skip the xattr/forkoff levering with the newer swapext implementations
-  - xfs_fsr: convert to bulkstat v5 ioctls
-  - xfs_logprint: support dumping exchmaps log items
-  - xfs_db: advertise exchange-range in the version command
-  - libfrog: add support for exchange range ioctl family
-  - libhandle: add support for bulkstat v5
-  - man: document XFS_FSOP_GEOM_FLAGS_EXCHRANGE
-  - man: document the exchange-range ioctl
-  - xfs_repair: don't crash on -vv
-  - xfsprogs: Remove support for split-/usr installs
-  - libxfs: kernel sync
-
- -------------------------------------------------------------------
-Mon Jul 22 10:54:50 UTC 2024 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 6.9.0
-  - xfs_db: Fix uninicialized error variable
-  - mkfs.xfs: avoid potential overflowing expression in xfs_mkfs.c
-  - xfs_io: fix mread with length 1 mod page size
-  - xfs_repair: detect null buf passed to duration
-  - xfs_io: fix gcc complaints about potentially uninitialized variables
-  - xfs_scrub: upload clean bills of health
-  - xfs_spaceman: report health of inode link counts
-  - xfs_repair: reduce rmap bag memory usage when creating refcounts
-  - xfs_repair: log when buffers fail CRC checks even if we just recompute it
-  - xfs_scrub: use multiple threads to run scrubs that scan inodes
-  - xfs_scrub: update health status if we get a clean bill of health
-  - xfs_repair: verify on-disk rmap btrees with in-memory btree data
-  - xfs_scrub: check file link counts
-  - xfs_scrub: implement live quotacheck inode scan
-  - libxfs: provide a kernel-compatible kasprintf
-  - xfs_spaceman: report the health of quota counts
-  - libxfs: partition memfd files to avoid using too many fds
-  - libxfs: add xfile support
-  - libxfs: teach buftargs to maintain their own buffer hashtable
-  - libxfs: kernel sync
-
- -------------------------------------------------------------------
-Fri May 17 15:34:53 UTC 2024 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 6.8.0
-  - xfs_repair: Dump both inode details in Phase 6 duplicate file check
-  - libxfs: print the device name if flush-on-close fails
-  - xfs_db: fix leak in flist_find_ftyp()
-  - xfs_repair: support more than INT_MAX block maps
-  - xfs_repair: constrain attr fork extent count
-  - xfs_repair: support more than 2^32 owners per physical block
-  - xfs_repair: support more than 2^32 rmapbt records per AG
-  - xfs_db: add a bmbt inflation command
-  - xfs_scrub: scan whole-fs metadata files in parallel
-  - mkfs: allow sizing internal logs for concurrency
-  - mkfs: allow sizing allocation groups for concurrency
-  - mkfs: use a sensible log sector size default
-  - xfs_io: add linux madvise advice codes
-  - xfs_scrub: fix threadcount estimates for phase 6
-  - xfs_db: improve number extraction in getbitval
-  - xfs_repair: adjust btree bulkloading slack computations to match online repair
-  - xfs: make rextslog computation consistent with mkfs
-  - mkfs: fix log sunit rounding when external logs are in use
-  - libxfs: kernel sync
-
--------------------------------------------------------------------
-Thu Apr 18 19:13:22 UTC 2024 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 6.7.0
-  - xfsprogs: Several configure script updates
-  - xfs_io: Use system's SEEK_DATA and SEEK_HOLE definition
-  - xfsprogs: Remove platform_defs.h generation on build time
-  - xfs_db: Fix metadata read error due hardcoded initialization of bb_count
-  - xfsprogs: Request 64-bit time_t where possible
-  - xfsprogs: Remove use of LFS64 interfaces
-
--------------------------------------------------------------------
-Wed Apr  3 09:27:56 UTC 2024 - Hans-Peter Jansen <hpj@urpla.net>
-
-- Switch to %autosetup in order to build with older rpm build
-
--------------------------------------------------------------------
-Mon Feb  5 14:40:20 UTC 2024 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 6.6.0
-  - xfs_scrub: add missing license and copyright information
-  - xfs_db: report the device associated with each io cursor
-  - libxfs: Fix UAF in a requeued EFI
-  - xfs_io: Add new option, to exercise log2_data_unit_size in kernel fscrypt_policy_v2
-  - xfs_db: Add upport to read from external log device
-  - metadump: New metadump format
-  - xfs_quota: fix missing mount point warning
-
--------------------------------------------------------------------
-Fri Oct 13 14:45:05 UTC 2023 - Anthony Iliopoulos <ailiop@suse.com>
 
 - update to 6.5.0
   - libxfs: fix atomic64_t detection on x86_32
@@ -349,7 +15,10 @@ Fri Oct 13 14:45:05 UTC 2023 - Anthony Iliopoulos <ailiop@suse.com>
   - xfsprogs: don't allow udisks to automount XFS filesystems with no prompt
   - xfs_repair: fix repair failure caused by dirty flag being abnormally set on buffer
 
-- drop 0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch
+-------------------------------------------------------------------
+Fri Oct  6 20:53:14 UTC 2023 - Anthony Iliopoulos <ailiop@suse.com>
+
+- Drop 0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch
 
   This was a fix for a regression that occurred in SLE12 SP1. We can
   safely drop this, as upgrading to SLE15 (and later) is only supported
@@ -375,15 +44,6 @@ Thu Jul 20 08:45:36 UTC 2023 - Anthony Iliopoulos <ailiop@suse.com>
   - xfs_db: fix metadump name obfuscation for ascii-ci filesystems
   - libxfs: kernel sync
 
--------------------------------------------------------------------
-Mon May 22 19:51:34 UTC 2023 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 6.3.0:
-  - xfs_repair: Don't leak buffer when discarding directories
-  - xfs_repair: estimate per-AG btree slack better
-  - xfs_db: fix broken logic in error path
-  - xfsprogs: nrext64 option is now in [inode] section of mkfs conf files
-
 -------------------------------------------------------------------
 Fri Mar 24 13:45:04 UTC 2023 - Anthony Iliopoulos <ailiop@suse.com>
 
@@ -2637,3 +2297,4 @@ Fri Jun 15 10:36:23 CEST 2001 - choeger@suse.de
 Mon May 21 14:30:40 CEST 2001 - choeger@suse.de
 
 - first version
+

xfsprogs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xfsprogs
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 %endif
 %define libname libhandle1
 Name:           xfsprogs
-Version:        6.13.0
+Version:        6.5.0
 Release:        0
 Summary:        Utilities for managing the XFS file system
 License:        GPL-2.0-or-later
@@ -37,10 +37,8 @@ Source2:        %{name}.keyring
 Source3:        module-setup.sh.in
 Source4:        dracut-fsck-help.txt
 Patch0:         xfsprogs-docdir.diff
-Patch1:         mkfs-fix-filesize-function-compilation-error-on-32-b.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  gcc-c++
 BuildRequires:  libblkid-devel
 BuildRequires:  libedit-devel
 BuildRequires:  libinih-devel
@@ -109,7 +107,8 @@ Scripts and systemd service files for background scrubbing of metadata
 on xfs filesystems.
 
 %prep
-%autosetup -p1
+%setup -q
+%patch0 -p1
 
 %build
 aclocal -I m4
@@ -204,19 +203,15 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
 
 %files -n xfsprogs-scrub
 %defattr(-,root,root,755)
-%dir %{_libexecdir}/xfsprogs
+%dir %{_libdir}/xfsprogs/
-%{_prefix}/share/xfsprogs/xfs_scrub_all.cron
+%{_libdir}/xfsprogs/xfs_scrub_all.cron
 %{_sbindir}/xfs_scrub_all
 %if %{with systemd}
-%{_libexecdir}/xfsprogs/xfs_scrub_fail
+%{_libdir}/xfsprogs/xfs_scrub_fail
 %{_unitdir}/xfs_scrub@.service
 %{_unitdir}/xfs_scrub_all.service
 %{_unitdir}/xfs_scrub_all.timer
 %{_unitdir}/xfs_scrub_fail@.service
-%{_unitdir}/xfs_scrub_all_fail.service
-%{_unitdir}/xfs_scrub_media@.service
-%{_unitdir}/xfs_scrub_media_fail@.service
-%{_unitdir}/system-xfs_scrub.slice
 %endif
 
 %changelog