Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/udisks2.git#df05017b2dbea9ff1d9305b5e43b56123538de6b

udisks2.spec

@@ -9,7 +9,6 @@
 
 %define with_bcache                     1
 %define with_btrfs                      1
-%define with_vdo                        1
 %define with_lsm                        1
 %define with_zram                       1
 %define with_lvmcache                   1
@@ -33,16 +32,6 @@
 %define with_btrfs 0
 %endif
 
-# vdo is not available on Fedora
-%if (0%{?fedora}) || 0%{?rhel} >= 9 || %{with_vdo} == 0
-%define with_vdo 0
-%endif
-
-# vdo is not available on i686
-%ifnarch x86_64 aarch64 ppc64le s390x
-%define with_vdo 0
-%endif
-
 # feature parity with existing RHEL 7 packages
 %if (0%{?rhel}) && (0%{?rhel} <= 7)
 %define with_lsm 0
@@ -59,11 +48,12 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.1
-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
 
+BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
 BuildRequires: libgudev1-devel >= %{systemd_version}
@@ -249,19 +239,6 @@ Obsoletes: storaged-zram
 This package contains module for ZRAM configuration.
 %endif
 
-%if 0%{?with_vdo}
-%package -n %{name}-vdo
-Summary: Module for VDO
-Requires: %{name}%{?_isa} = %{version}-%{release}
-License: LGPLv2+
-Requires: vdo
-Requires: libblockdev-vdo >= %{libblockdev_version}
-BuildRequires: libblockdev-vdo-devel >= %{libblockdev_version}
-
-%description -n %{name}-vdo
-This package contains module for VDO management.
-%endif
-
 %prep
 %setup -q -n udisks-%{version}
 sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/"
@@ -281,9 +258,7 @@ autoreconf -ivf
 %if 0%{?with_btrfs}
     --enable-btrfs    \
 %endif
-%if 0%{?with_vdo}
-    --enable-vdo      \
-%endif
+    --disable-vdo      \
 %if 0%{?with_zram}
     --enable-zram     \
 %endif
@@ -419,9 +394,6 @@ fi
 %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
@@ -453,13 +425,10 @@ fi
 %{_udevrulesdir}/90-udisks2-zram.rules
 %endif
 
-%if 0%{?with_vdo}
-%files -n %{name}-vdo
-%{_libdir}/udisks2/modules/libudisks2_vdo.so
-%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.vdo.policy
-%endif
-
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Sep 07 2020 Neal Gompa <ngompa13@gmail.com> - 2.9.1-2
 - Fix conditional around polkit Recommends for building on EL7