From 92fceb0c5dabd8f7845a1648d3e5ff3140e16edc Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 7 Sep 2023 15:47:38 +0200
Subject: [PATCH] * Thu Sep 07 2023 Tomas Bzatek <tbzatek@redhat.com> -
 2.10.1-1 - Version 2.10.1 - Default to ntfs-3g for stability reasons
 (#2182206) - Use Recommends: for filesystem tools (#2169848)

---
 .gitignore   |  1 +
 sources      |  2 +-
 udisks2.spec | 33 +++++++++++++++++++++------------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index afb30d1..148ecf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /udisks-2.9.3.tar.bz2
 /udisks-2.9.4.tar.bz2
 /udisks-2.10.0.tar.bz2
+/udisks-2.10.1.tar.bz2
diff --git a/sources b/sources
index 0eeb143..3712713 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.10.0.tar.bz2) = 3c9dc18dd5f6d61442205f4df2592ebf79211d12d71168f96e6814c2ce16f7a46cda7c0a5ccf47b7dc8b655d8af654d5a62e54b04e5b600af0b15558442cf3ed
+SHA512 (udisks-2.10.1.tar.bz2) = 9cdaeca4306a970c85f88d406dbe5d2dad23d72f47d9ab1c021b8c2888d4c790f680eb94388d86f9255024283b4a36e98b8aee4408d193a7d4aad1e74463356a
diff --git a/udisks2.spec b/udisks2.spec
index 2158e5c..bde7a8b 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -23,8 +23,8 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.10.0
-Release: 2%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -74,17 +74,17 @@ Requires: libatasmart >= %{libatasmart_version}
 # For mount, umount, mkswap
 Requires: util-linux
 # For mkfs.ext3, mkfs.ext3, e2label
-Requires: e2fsprogs
+Recommends: e2fsprogs
 # For mkfs.xfs, xfs_admin
-Requires: xfsprogs
+Recommends: xfsprogs
 # For mkfs.vfat
-Requires: dosfstools
+Recommends: dosfstools
 # For exfat
-Requires: exfatprogs
+Recommends: exfatprogs
 # For UDF
-Requires: udftools
+Recommends: udftools
 # For ejecting removable disks
-Requires: eject
+Recommends: eject
 # For utab monitor
 Requires: libmount
 # The actual polkit agent
@@ -92,16 +92,17 @@ Requires: polkit >= %{polkit_version}
 
 # For mkntfs (not available on rhel or on ppc/ppc64) and f2fs
 %if %{is_fedora}
-Requires: f2fs-tools
-Requires: nilfs-utils
+Recommends: f2fs-tools
+Recommends: nilfs-utils
 %ifnarch ppc ppc64
-Requires: ntfsprogs
+Recommends: ntfsprogs
 %endif
 %endif
+Recommends: ntfs-3g
 
 # btrfs
 %if 0%{?with_btrfs}
-Requires: btrfs-progs
+Recommends: btrfs-progs
 %endif
 
 Provides:  storaged = %{version}-%{release}
@@ -189,6 +190,9 @@ This package contains module for LSM configuration.
 %prep
 %autosetup -p1 -n udisks-%{version}
 rm -f src/tests/dbus-tests/config_h.py
+rm -f src/udisks-daemon-resources.{c,h}
+# default to ntfs-3g (#2182206)
+sed -i data/builtin_mount_options.conf -e 's/ntfs_drivers=ntfs3,ntfs/ntfs_drivers=ntfs,ntfs3/'
 
 %build
 # autoreconf -ivf
@@ -328,6 +332,11 @@ fi
 %endif
 
 %changelog
+* Thu Sep 07 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-1
+- Version 2.10.1
+- Default to ntfs-3g for stability reasons (#2182206)
+- Use Recommends: for filesystem tools (#2169848)
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild