From 72f25be85a4b2a40e0ae0c524a7f005ba763c5ca Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Tue, 26 May 2020 18:01:08 +0200
Subject: [PATCH] * Tue May 26 2020 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-1
 - Version 2.9.0

---
 .gitignore   |  1 +
 sources      |  2 +-
 udisks2.spec | 32 +++++++++++++++++++++++++-------
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 042b391..944284a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /udisks-2.8.1.tar.bz2
 /udisks-2.8.2.tar.bz2
 /udisks-2.8.4.tar.bz2
+/udisks-2.9.0.tar.bz2
diff --git a/sources b/sources
index f76a3b6..615c536 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.8.4.tar.bz2) = 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
+SHA512 (udisks-2.9.0.tar.bz2) = 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c
diff --git a/udisks2.spec b/udisks2.spec
index 67ce1e1..9476d48 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -5,7 +5,7 @@
 %global libatasmart_version             0.17
 %global dbus_version                    1.4.0
 %global with_gtk_doc                    1
-%global libblockdev_version             2.19
+%global libblockdev_version             2.24
 
 %define with_bcache                     1
 %define with_btrfs                      1
@@ -58,8 +58,8 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.8.4
-Release: 4%{?dist}
+Version: 2.9.0
+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
@@ -84,6 +84,7 @@ BuildRequires: libblockdev-mdraid-devel >= %{libblockdev_version}
 BuildRequires: libblockdev-fs-devel     >= %{libblockdev_version}
 BuildRequires: libblockdev-crypto-devel >= %{libblockdev_version}
 BuildRequires: libmount-devel
+BuildRequires: libuuid-devel
 
 Requires: libblockdev        >= %{libblockdev_version}
 Requires: libblockdev-part   >= %{libblockdev_version}
@@ -306,7 +307,6 @@ chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd
 
 %post -n %{name}
 %systemd_post udisks2.service
-%systemd_post clean-mount-point@.service
 # skip retriggering if udevd isn't even accessible, e.g. containers or
 # rpm-ostree-based systems
 if [ -S /run/udev/control ]; then
@@ -316,11 +316,9 @@ fi
 
 %preun -n %{name}
 %systemd_preun udisks2.service
-%systemd_preun clean-mount-point@.service
 
 %postun -n %{name}
 %systemd_postun_with_restart udisks2.service
-%systemd_postun clean-mount-point@.service
 
 %ldconfig_scriptlets -n lib%{name}
 
@@ -344,12 +342,12 @@ fi
 %dir %{_sysconfdir}/udisks2/modules.conf.d
 %endif
 %{_sysconfdir}/udisks2/udisks2.conf
+%{_sysconfdir}/udisks2/mount_options.conf.example
 
 %{_datadir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
 %{_datadir}/bash-completion/completions/udisksctl
 %{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/udisks2.service
-%{_unitdir}/clean-mount-point@.service
 %{_udevrulesdir}/80-udisks2.rules
 %{_sbindir}/umount.udisks2
 
@@ -397,6 +395,23 @@ fi
 %{_datadir}/gtk-doc/html/udisks2/*
 %endif
 %{_libdir}/pkgconfig/udisks2.pc
+%{_libdir}/pkgconfig/udisks2-lvm2.pc
+%{_libdir}/pkgconfig/udisks2-iscsi.pc
+%if 0%{?with_bcache}
+%{_libdir}/pkgconfig/udisks2-bcache.pc
+%endif
+%if 0%{?with_btrfs}
+%{_libdir}/pkgconfig/udisks2-btrfs.pc
+%endif
+%if 0%{?with_lsm}
+%{_libdir}/pkgconfig/udisks2-lsm.pc
+%endif
+%if 0%{?with_zram}
+%{_libdir}/pkgconfig/udisks2-zram.pc
+%endif
+%if 0%{?with_vdo}
+%{_libdir}/pkgconfig/udisks2-vdo.pc
+%endif
 
 %if 0%{?with_bcache}
 %files -n %{name}-bcache
@@ -434,6 +449,9 @@ fi
 %endif
 
 %changelog
+* Tue May 26 2020 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-1
+- Version 2.9.0
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild