From 563cf8f51baaab9ba0ede16752ba335a59107f7f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 3 Mar 2022 12:39:14 +0100
Subject: [PATCH 1/2] * Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> -
 2.9.4-3 - Require ntfs-3g (#2058506)

---
 udisks2.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/udisks2.spec b/udisks2.spec
index 4332af8..a48b066 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -43,7 +43,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.4
-Release: 2%{?dist}
+Release: 3%{?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
@@ -114,9 +114,8 @@ Requires: lib%{name}%{?_isa} = %{version}-%{release}
 
 # For mkntfs (not available on rhel or on ppc/ppc64)
 %if ! 0%{?rhel}
-%ifnarch ppc ppc64
 Requires: ntfsprogs
-%endif
+Requires: ntfs-3g
 %endif
 
 Provides:  storaged = %{version}-%{release}
@@ -420,6 +419,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-3
+- Require ntfs-3g (#2058506)
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 649a5a519eaee39eb8bb3f4ebdf20f003fb27f5f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 3 Mar 2022 16:31:00 +0100
Subject: [PATCH 2/2] * Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> -
 2.9.4-4 - Fix gtk-doc annotations

---
 udisks-2.10.0-doc_annotations.patch | 39 +++++++++++++++++++++++++++++
 udisks2.spec                        |  6 ++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 udisks-2.10.0-doc_annotations.patch

diff --git a/udisks-2.10.0-doc_annotations.patch b/udisks-2.10.0-doc_annotations.patch
new file mode 100644
index 0000000..30f85fc
--- /dev/null
+++ b/udisks-2.10.0-doc_annotations.patch
@@ -0,0 +1,39 @@
+From 1ef9ab02af5c10a0fc7611c5579c4bc2344e83d0 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Tue, 15 Feb 2022 13:25:22 +0100
+Subject: [PATCH] doc: Fix @since: annotations
+
+Recent changes in gdbus-codegen (2.71.1) have introduced parser
+issues on malformed annotations.
+
+https://gitlab.gnome.org/GNOME/glib/-/issues/2601
+---
+ data/org.freedesktop.UDisks2.xml                   | 2 +-
+ modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
+index 23f18746f..d9045a7f3 100644
+--- a/data/org.freedesktop.UDisks2.xml
++++ b/data/org.freedesktop.UDisks2.xml
+@@ -1802,7 +1802,7 @@
+     <!-- Resize:
+          @size: New partition size in bytes, 0 for maximal size.
+          @options: Options.
+-         @since 2.7.2
++         @since: 2.7.2
+ 
+          Resizes the partition.
+ 
+diff --git a/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml b/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
+index 46c8e5ac7..c1d61d44f 100644
+--- a/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
++++ b/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
+@@ -321,7 +321,6 @@
+          @write_policy: Specifies the write policy.
+          @options: Additional options.
+          @result: The object path of the new VDO logical volume.
+-
+          @since: 2.9.0
+ 
+          Create a new VDO logical volume that is backed by a newly created
diff --git a/udisks2.spec b/udisks2.spec
index a48b066..d1d356b 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -43,11 +43,12 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.4
-Release: 3%{?dist}
+Release: 4%{?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
 Patch0:  ignore-apple-boot-part.patch
+Patch1:  udisks-2.10.0-doc_annotations.patch
 
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -419,6 +420,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-4
+- Fix gtk-doc annotations
+
 * Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-3
 - Require ntfs-3g (#2058506)