udisks2-2.9.4-1

u/udisks2/udisks2-vl.spec

@@ -1,24 +1,25 @@
 %bcond_with systemd
+%bcond_without docs
 
 %define glib2_version           2.40.0
 %define dbus_version            1.6.14
 %define polkit_version          0.104
 %define libatasmart_version     0.17
-%global libblockdev_version     2.24
+%global libblockdev_version     2.25
 
 # valid options are 'luks1' or 'luks2'
 %define default_luks_encryption luks2
 
 Summary: Storage Management Service
 Name: udisks2
-Version: 2.9.0
+Version: 2.9.4
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: admin-tools,system
 Vendor: Project Vine
 Distribution: Vine Linux
 
 License: GPLv2+
-URL: http://www.freedesktop.org/wiki/Software/udisks
+URL: https://www.freedesktop.org/wiki/Software/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -33,7 +34,9 @@ BuildRequires: intltool
 BuildRequires: libatasmart-devel >= %{libatasmart_version}
 BuildRequires: lvm2-devel
 BuildRequires: chrpath
+%if %{with docs}
 BuildRequires: gtk-doc
+%endif
 BuildRequires: gettext-devel
 BuildRequires: libblockdev-devel        >= %{libblockdev_version}
 BuildRequires: libblockdev-crypto-devel >= %{libblockdev_version}
@@ -169,6 +172,7 @@ Requires: %{name} = %{version}-%{release}
 D-Bus interface definitions and documentation for udisks.
 
 
+%if %{with docs}
 %package        docs
 Summary:        Documentation for udisks2
 Group:          documentation
@@ -178,6 +182,7 @@ Provides:       %{name}-doc = %{version}-%{release}
 
 %description    docs
 This package contains documentation for udisks2.
+%endif
 
 
 %prep
@@ -191,9 +196,16 @@ autoreconf -vif
 	--sbindir=%{_syssbindir} \
 	--enable-lvm2 \
 	--enable-lvmcache \
-	--enable-zram \
 	--enable-bcache \
-	--enable-gtk-doc
+%if %{with systemd}
+	--enable-zram \
+%endif
+%if %{with docs}
+	--enable-gtk-doc \
+%else
+	--disable-gtk-doc
+%endif
+	%{nil}
 make %{?_smp_mflags}
 
 
@@ -218,7 +230,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-/sbin/ldconfig
 %if %{with systemd}
 %systemd_post udisks2.service
 %endif
@@ -235,20 +246,19 @@ fi
 %endif
 
 %postun
-/sbin/ldconfig
 %if %{with systemd}
 %systemd_postun_with_restart udisks2.service
 %endif
 
 %if %{with systemd}
 %post -n %{name}-zram
-%systemd_post zram-setup@.service
+%systemd_post udisks2-zram-setup@.service
 
 %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
 
 
@@ -287,12 +297,13 @@ fi
 %{_libdir}/udisks2/modules/libudisks2_lvm2.so
 %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy
 
+%if %{with systemd}
 %files zram
 %dir %{_sysconfdir}/udisks2/modules.conf.d
 %{_libdir}/udisks2/modules/libudisks2_zram.so
 %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy
-%if %{with systemd}
+%{_unitdir}/udisks2-zram-setup@.service
-%{_unitdir}/zram-setup@.service
+/lib/udev/rules.d/90-udisks2-zram.rules
 %endif
 
 %files bcache
@@ -312,12 +323,17 @@ fi
 %{_libdir}/pkgconfig/udisks2*.pc
 %{_datadir}/gir-1.0/UDisks-2.0.gir
 
+%if %{with docs}
 %files docs
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/%{name}
+%endif
 
 #
 %changelog
+* Thu Dec 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.4-1
+- new upstream release.
+
 * Tue Aug 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.0-1
 - new upstream release.
 - added systemd support (disabled as default).