udisks2-2.8.1-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12015 ec354946-7b23-47d6-9f5a-488ba84defc7

u/udisks2/udisks2-vl.spec

@@ -9,11 +9,12 @@
 %define sg3_utils_version       1.27
 %define smp_utils_version       0.94
 %define lvm2_version            2.02.78
+%global libblockdev_version     2.19
 
 Summary: Storage Management Service
 Name: udisks2
 Version: 2.8.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -23,6 +24,9 @@ Source0: http://udisks.freedesktop.org/releases/udisks-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gobject-introspection-devel
+BuildRequires: eudev-libgudev1-devel
+BuildRequires: eudev-libudev-devel
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: polkit-devel >= %{polkit_version}
@@ -31,12 +35,25 @@ BuildRequires: device-mapper-devel >= %{device_mapper_version}
 BuildRequires: libacl-devel
 BuildRequires: intltool
 BuildRequires: libatasmart-devel >= %{libatasmart_version}
-BuildRequires: eudev-libgudev1-devel
-BuildRequires: eudev-libudev-devel
 BuildRequires: sg3_utils-devel >= %{sg3_utils_version}
 BuildRequires: lvm2-devel >= %{lvm2_version}
-BuildRequires: gobject-introspection-devel
 BuildRequires: elogind-devel
+BuildRequires: gnome-common
+BuildRequires: libmount-devel
+BuildRequires: chrpath
+BuildRequires: libblockdev-devel        >= %{libblockdev_version}
+BuildRequires: libblockdev-crypto-devel >= %{libblockdev_version}
+BuildRequires: libblockdev-dm-devel     >= %{libblockdev_version}
+BuildRequires: libblockdev-fs-devel     >= %{libblockdev_version}
+BuildRequires: libblockdev-kbd-devel    >= %{libblockdev_version}
+BuildRequires: libblockdev-loop-devel   >= %{libblockdev_version}
+BuildRequires: libblockdev-lvm-devel    >= %{libblockdev_version}
+BuildRequires: libblockdev-mdraid-devel >= %{libblockdev_version}
+BuildRequires: libblockdev-part-devel   >= %{libblockdev_version}
+BuildRequires: libblockdev-swap-devel   >= %{libblockdev_version}
+%if 0
+BuildRequires: libblockdev-vdo-devel    >= %{libblockdev_version}
+%endif
 
 # needed to pull in the system bus daemon
 Requires: dbus >= %{dbus_version}
@@ -63,6 +80,14 @@ Requires: ntfsprogs
 %endif
 Requires: gdisk
 
+Requires: libblockdev        >= %{libblockdev_version}
+Requires: libblockdev-part   >= %{libblockdev_version}
+Requires: libblockdev-loop   >= %{libblockdev_version}
+Requires: libblockdev-swap   >= %{libblockdev_version}
+Requires: libblockdev-mdraid >= %{libblockdev_version}
+Requires: libblockdev-fs     >= %{libblockdev_version}
+Requires: libblockdev-crypto >= %{libblockdev_version}
+
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
@@ -79,6 +104,45 @@ Distribution: Vine Linux
 udisks provides a daemon, D-Bus API and command line tools
 for managing disks and storage devices.
 
+
+%package lvm2
+Summary: udisks2 module for LVM2
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+License: LGPLv2+
+Requires: lvm2
+Requires: libblockdev-lvm >= %{libblockdev_version}
+
+%description lvm2
+This package contains module for LVM2 configuration.
+
+
+%package zram
+Summary: udisks2 module for ZRAM
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+License: LGPLv2+
+Requires: libblockdev-kbd >= %{libblockdev_version}
+Requires: libblockdev-swap >= %{libblockdev_version}
+
+%description zram
+This package contains module for ZRAM configuration.
+
+
+%if 0
+%package vdo
+Summary: udisks2 module for VDO
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+License: LGPLv2+
+Requires: vdo
+Requires: libblockdev-vdo >= %{libblockdev_version}
+
+%description vdo
+This package contains module for VDO management.
+%endif
+
+
 %package devel
 Summary: D-Bus interface definitions for udisks
 Group: Development/Libraries
@@ -97,6 +161,7 @@ Requires:       %{name} = %{version}-%{release}
 BuildArch:		noarch
 Provides:       %{name}-doc = %{version}-%{release}
 
+
 %description    docs
 This package contains documentation for udisks2.
 
@@ -105,8 +170,12 @@ This package contains documentation for udisks2.
 %setup -q -n udisks-%{version}
 
 %build
+autoreconf -vif
 %configure \
 	--sbindir=%{_syssbindir} \
+	--enable-lvm2 \
+	--enable-lvmcache \
+	--enable-zram \
 	--enable-gtk-doc
 make
 
@@ -115,17 +184,29 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+find %{buildroot} -name \*.la -o -name \*.a | xargs rm
+
+chrpath --delete %{buildroot}/%{_syssbindir}/umount.udisks2
+chrpath --delete %{buildroot}/%{_bindir}/udisksctl
+chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd
 
-mkdir $RPM_BUILD_ROOT/run
+mkdir %{buildroot}/run
+
+mkdir -p %{buildroot}/%{_sysconfdir}/udisks2/modules.conf.d
+
+perl -pi \
+	-e 's/modules_load_preference=ondemand/modules_load_preference=onstartup/' \
+	%{buildroot}%{_sysconfdir}/udisks2/udisks2.conf
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+udevadm control --reload
+udevadm trigger
 
 %postun -p /sbin/ldconfig
 
@@ -141,6 +222,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/udisks2/udisksd
 %{_libdir}/libudisks2.so.*
 %{_libdir}/girepository-1.0/UDisks-2.0.typelib
+%dir %{_libdir}/udisks2
+%dir %{_libdir}/udisks2/modules
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/udisksctl
@@ -152,6 +235,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0700,root,root) %dir %{_localstatedir}/lib/udisks2
 %attr(0755,root,root) %dir /run
 
+%files lvm2
+%{_libdir}/udisks2/modules/libudisks2_lvm2.so
+%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy
+
+%files zram
+%dir %{_sysconfdir}/udisks2/modules.conf.d
+%{_libdir}/udisks2/modules/libudisks2_zram.so
+%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy
+
+%if 0
+%files vdo
+%{_libdir}/udisks2/modules/libudisks2_vdo.so
+%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.vdo.policy
+%endif
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/udisks2
@@ -165,6 +263,9 @@ rm -rf $RPM_BUILD_ROOT
 
 #
 %changelog
+* Mon Jan 07 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.1-2
+- enabled lvm2, lvmcache and zram.
+
 * Mon Dec 17 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.1-1
 - new upstream release.
 - enabled elogind.