diff --git a/.gitignore b/.gitignore index 944284a..ef9f576 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /udisks-2.8.2.tar.bz2 /udisks-2.8.4.tar.bz2 /udisks-2.9.0.tar.bz2 +/udisks-2.9.1.tar.bz2 diff --git a/sources b/sources index 615c536..e711ce4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.9.0.tar.bz2) = 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c +SHA512 (udisks-2.9.1.tar.bz2) = a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3 diff --git a/udisks2.spec b/udisks2.spec index 09dd5e1..b8ae69a 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -58,8 +58,8 @@ Name: udisks2 Summary: Disk Manager -Version: 2.9.0 -Release: 2%{?dist} +Version: 2.9.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 @@ -118,6 +118,12 @@ Requires: eject # For utab monitor Requires: libmount +%if (0%{?rhel}) && (0%{?rhel} <= 7) +# Not really needed but doesn't make much sense to use UDisks without polkit +# (weak deps don't work on older versions of RHEL) +Recommends: polkit +%endif + Requires: lib%{name}%{?_isa} = %{version}-%{release} # For mkntfs (not available on rhel or on ppc/ppc64) @@ -324,13 +330,17 @@ fi %if 0%{?with_zram} %post -n %{name}-zram -%systemd_post zram-setup@.service +%systemd_post udisks2-zram-setup@.service +if [ -S /run/udev/control ]; then + udevadm control --reload + udevadm trigger +fi %preun -n %{name}-zram -%systemd_preun zram-setup@.service +%systemd_preun udisks2-zram-setup@.service %postun -n %{name}-zram -%systemd_postun zram-setup@.service +%systemd_postun udisks2-zram-setup@.service %endif %files -f udisks2.lang @@ -439,7 +449,8 @@ fi %dir %{_sysconfdir}/udisks2/modules.conf.d %{_libdir}/udisks2/modules/libudisks2_zram.so %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy -%{_unitdir}/zram-setup@.service +%{_unitdir}/udisks2-zram-setup@.service +%{_udevrulesdir}/90-udisks2-zram.rules %endif %if 0%{?with_vdo} @@ -449,6 +460,10 @@ fi %endif %changelog +* Wed Aug 12 2020 Tomas Bzatek - 2.9.1-1 +- Version 2.9.1 +- Renamed zram-setup@.service to udisks2-zram-setup@.service + * Wed Jul 29 2020 Fedora Release Engineering - 2.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild