- separated modules subpackages

diff --git a/udisks2.spec b/udisks2.spec
index d9f734e8bae88dfbe0b7f7cd1f5a827af9361c6f..a2984ad7fa3f0bd0874858a964f7b90946da6be3 100644 (file)
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -57,19 +57,13 @@ BuildRequires:      udev-glib-devel >= 1:165
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      libatasmart >= 0.17
 Requires:      libblockdev >= 2.25
-Requires:      libblockdev-btrfs >= 2.25
 Requires:      libblockdev-crypto >= 2.25
 Requires:      libblockdev-fs >= 2.25
 Requires:      libblockdev-loop >= 2.25
-Requires:      libblockdev-lvm >= 2.25
 Requires:      libblockdev-mdraid >= 2.25
-Requires:      libblockdev-kbd >= 2.25
 Requires:      libblockdev-part >= 2.25
 Requires:      libblockdev-swap >= 2.25
-%{?with_vdo:Requires:  libblockdev-vdo >= 2.25}
-%{?with_libstoragemgmt:Requires:       libconfig >= 1.3.2}
 Requires:      libmount >= 2.30
-%{?with_libstoragemgmt:Requires:       libstoragemgmt-daemon >= 1.3.0}
 Requires:      polkit >= 0.102
 Requires:      systemd-units >= 44
 Requires:      udev-core >= 1:147
@@ -100,6 +94,99 @@ udisks dostarcza demona, API D-Bus oraz narzędzia linii poleceń do
 zarządzania dyskami i innymi urządzeniami przechowującymi dane. Ten
 pakiet jest przeznaczony dla udisks z serii 2.x.
 
+%package module-bcache
+Summary:       Bcache support module for udisks2
+Summary(pl.UTF-8):     Moduł obsługi Bcache dla udisks2
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libblockdev-kbd >= 2.25
+
+%description module-bcache
+Bcache support module for udisks2.
+
+%description module-bcache -l pl.UTF-8
+Moduł obsługi Bcache dla udisks2.
+
+%package module-btrfs
+Summary:       BTRFS support module for udisks2
+Summary(pl.UTF-8):     Moduł obsługi BTRFS dla udisks2
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libblockdev-btrfs >= 2.25
+
+%description module-btrfs
+BTRFS support module for udisks2.
+
+%description module-btrfs -l pl.UTF-8
+Moduł obsługi BTRFS dla udisks2.
+
+%package module-iscsi
+Summary:       iSCSI support module for udisks2
+Summary(pl.UTF-8):     Moduł obsługi iSCSI dla udisks2
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      open-iscsi >= 2.1.4
+
+%description module-iscsi
+iSCSI support module for udisks2.
+
+%description module-iscsi -l pl.UTF-8
+Moduł obsługi iSCSI dla udisks2.
+
+%package module-lsm
+Summary:       LibStorageMgmt support module for udisks2
+Summary(pl.UTF-8):     Moduł obsługi LibStorageMgmt dla udisks2
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libconfig >= 1.3.2
+Requires:      libstoragemgmt-daemon >= 1.3.0
+
+%description module-lsm
+LibStorageMgmt support module for udisks2.
+
+%description module-lsm -l pl.UTF-8
+Moduł obsługi LibStorageMgmt dla udisks2.
+
+%package module-lvm2
+Summary:       LVM2 support module for udisks2
+Summary(pl.UTF-8):     Moduł obsługi LVM2 dla udisks2
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libblockdev-lvm >= 2.25
+
+%description module-lvm2
+LVM2 support module for udisks2.
+
+%description module-lvm2 -l pl.UTF-8
+Moduł obsługi LVM2 dla udisks2.
+
+%package module-vdo
+Summary:       VDO support module for udisks2
+Summary(pl.UTF-8):     Moduł obsługi VDO dla udisks2
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libblockdev-vdo >= 2.25
+
+%description module-vdo
+VDO support module for udisks2.
+
+%description module-vdo -l pl.UTF-8
+Moduł obsługi VDO dla udisks2.
+
+%package module-zram
+Summary:       ZRAM support module for udisks2
+Summary(pl.UTF-8):     Moduł obsługi ZRAM dla udisks2
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libblockdev-kbd >= 2.25
+Requires:      libblockdev-swap >= 2.25
+
+%description module-zram
+ZRAM support module for udisks2.
+
+%description module-zram -l pl.UTF-8
+Moduł obsługi ZRAM dla udisks2.
+
 %package libs
 Summary:       udisks2 library
 Summary(pl.UTF-8):     Biblioteka udisks2
@@ -222,26 +309,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/udisks2
 %endif
 %dir %{_libdir}/udisks2/modules
-%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_bcache.so
-%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_btrfs.so
-%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_lvm2.so
-%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_zram.so
 %dir %{_sysconfdir}/udisks2
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udisks2/udisks2.conf
 %dir %{_sysconfdir}/udisks2/modules.conf.d
 /lib/udev/rules.d/80-udisks2.rules
-/lib/udev/rules.d/90-udisks2-zram.rules
-#%{systemdunitdir}/clean-mount-point@.service
 %{systemdunitdir}/udisks2.service
-%{systemdunitdir}/udisks2-zram-setup@.service
 %{systemdtmpfilesdir}/udisks2.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.UDisks2.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.bcache.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.btrfs.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy
 %{_mandir}/man1/udisksctl.1*
 %{_mandir}/man5/udisks2.conf.5*
 %{_mandir}/man8/udisks.8*
@@ -249,22 +325,48 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/umount.udisks2.8*
 %attr(700,root,root) %dir /var/lib/udisks2
 
+%if %{with vdo}
+%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_vdo.so
+%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.vdo.policy
+%endif
+
+%files module-bcache
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_bcache.so
+%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.bcache.policy
+
+%files module-btrfs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_btrfs.so
+%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.btrfs.policy
+
 %if %{with iscsi}
+%files module-iscsi
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_iscsi.so
 %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.iscsi.policy
 %endif
 
 %if %{with libstoragemgmt}
+%files module-lsm
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_lsm.so
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udisks2/modules.conf.d/udisks2_lsm.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lsm.policy
 %{_mandir}/man5/udisks2_lsm.conf.5*
 %endif
 
-%if %{with vdo}
-%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_vdo.so
-%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.vdo.policy
-%endif
+%files module-lvm2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_lvm2.so
+%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy
+
+%files module-zram
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_zram.so
+/lib/udev/rules.d/90-udisks2-zram.rules
+%{systemdunitdir}/udisks2-zram-setup@.service
+%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy
 
 %files libs
 %defattr(644,root,root,755)