Hello community, here is the log from the commit of package udisks2 for openSUSE:Factory checked in at 2018-04-22 14:31:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/udisks2 (Old) and /work/SRC/openSUSE:Factory/.udisks2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "udisks2" Sun Apr 22 14:31:52 2018 rev:30 rq:597157 version:2.7.6 Changes: -------- --- /work/SRC/openSUSE:Factory/udisks2/udisks2.changes 2018-03-12 12:10:48.949411699 +0100 +++ /work/SRC/openSUSE:Factory/.udisks2.new/udisks2.changes 2018-04-22 14:31:55.377723136 +0200 @@ -1,0 +2,8 @@ +Wed Mar 28 02:56:37 UTC 2018 - [email protected] + +- Require specific libblockdev plugins in due udisks2's modules, + following libblockdev's plugins split (bsc#1086447). +- Drop redundant libblockdev-devel BuildRequires: it is not needed + once its pkgconfig module is already a requirement. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udisks2.spec ++++++ --- /var/tmp/diff_new_pack.qVA3nq/_old 2018-04-22 14:31:56.161694762 +0200 +++ /var/tmp/diff_new_pack.qVA3nq/_new 2018-04-22 14:31:56.165694617 +0200 @@ -17,8 +17,9 @@ %define somajor 0 -%define libname lib%{name} -%define lbd_version 2.14 +%define libudisks lib%{name}-%{somajor} +%define libblockdev_version 2.14 + Name: udisks2 Version: 2.7.6 Release: 0 @@ -29,12 +30,21 @@ Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2 BuildRequires: chrpath BuildRequires: docbook-xsl-stylesheets -BuildRequires: gobject-introspection-devel >= 1.30.0 +BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libacl-devel -BuildRequires: libblockdev-devel >= %{lbd_version} +BuildRequires: libblockdev-btrfs-devel >= %{libblockdev_version} +BuildRequires: libblockdev-crypto-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} BuildRequires: lvm2-devel +BuildRequires: open-iscsi-devel BuildRequires: pkgconfig BuildRequires: xsltproc BuildRequires: pkgconfig(blkid) >= 2.17.0 @@ -52,7 +62,7 @@ BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102 BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) -Requires: %{libname}-%{somajor} = %{version} +Requires: %{libudisks} = %{version} # For LUKS devices Requires: cryptsetup # Needed to pull in the system bus daemon @@ -67,7 +77,12 @@ Requires: gptfdisk # We need at least this version for bugfixes/features etc. Requires: libatasmart-utils >= 0.17 -Requires: libblockdev >= %{lbd_version} +Requires: libblockdev >= %{libblockdev_version} +Requires: libblockdev-crypto >= %{libblockdev_version} +Requires: libblockdev-fs >= %{libblockdev_version} +Requires: libblockdev-mdraid >= %{libblockdev_version} +Requires: libblockdev-part >= %{libblockdev_version} +Requires: libblockdev-swap >= %{libblockdev_version} # Needed to pull in the udev daemon Requires: udev >= 208 # For mount, umount, mkswap @@ -75,7 +90,7 @@ # For mkfs.xfs, xfs_admin Requires: xfsprogs Recommends: %{name}-lang -Recommends: %{libname}_btrfs +Recommends: %{libudisks}_btrfs %{?systemd_requires} # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -86,12 +101,12 @@ The Udisks project provides a daemon, tools and libraries to access and manipulate disks, storage devices and technologies. -%package -n %{libname}-%{somajor} +%package -n %{libudisks} Summary: Dynamic library to access the UDisksd daemon License: LGPL-2.0-or-later Group: System/Libraries -%description -n %{libname}-%{somajor} +%description -n %{libudisks} This package contains the dynamic library, which provides access to the UDisksd daemon. @@ -107,66 +122,66 @@ This package provides the GObject Introspection bindings for the UDisks client library. -%package -n %{libname}-devel -Summary: Development files for %{libname} +%package -n %{libudisks}-devel +Summary: Development files for UDisks License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: %{libname}-%{somajor} >= %{version} +Requires: %{libudisks} >= %{version} -%description -n %{libname}-devel +%description -n %{libudisks}-devel This package contains the development files for the library libUDisks2, a dynamic library, which provides access to the UDisksd daemon. -%package -n %{libname}_bcache +%package -n %{libudisks}_bcache Summary: UDisks module for Bcache License: GPL-2.0-or-later Group: System/Libraries -Requires: %{libname}-%{somajor} >= %{version} -Requires: libblockdev >= %{lbd_version} +Requires: %{libudisks} >= %{version} +Requires: libblockdev-kbd >= %{libblockdev_version} -%description -n %{libname}_bcache +%description -n %{libudisks}_bcache This package contains the UDisks' module for bcache support. -%package -n %{libname}_btrfs +%package -n %{libudisks}_btrfs Summary: UDisks module for btrfs License: GPL-2.0-or-later Group: System/Libraries -Requires: %{libname}-%{somajor} >= %{version} -Requires: libblockdev >= %{lbd_version} +Requires: %{libudisks} >= %{version} +Requires: libblockdev-btrfs >= %{libblockdev_version} -%description -n %{libname}_btrfs +%description -n %{libudisks}_btrfs This package contains the UDisks' module for btrfs support. -%package -n %{libname}_lsm +%package -n %{libudisks}_lsm Summary: UDisks module for LSM License: GPL-2.0-or-later Group: System/Libraries -Requires: %{libname}-%{somajor} >= %{version} -Requires: libblockdev >= %{lbd_version} +Requires: %{libudisks} >= %{version} Requires: libstoragemgmt >= 1.3.0 -%description -n %{libname}_lsm +%description -n %{libudisks}_lsm This package contains the UDisks' module for lsm support. -%package -n %{libname}_lvm2 +%package -n %{libudisks}_lvm2 Summary: UDisks module for LVM2 License: GPL-2.0-or-later Group: System/Libraries -Requires: %{libname}-%{somajor} >= %{version} -Requires: libblockdev >= %{lbd_version} +Requires: %{libudisks} >= %{version} +Requires: libblockdev-lvm >= %{libblockdev_version} Requires: lvm2 -%description -n %{libname}_lvm2 +%description -n %{libudisks}_lvm2 This package contains the UDisks' module for LVM2 support. -%package -n %{libname}_zram +%package -n %{libudisks}_zram Summary: UDisks module for Zram License: GPL-2.0-or-later Group: System/Libraries -Requires: %{libname}-%{somajor} = %{version} -Requires: libblockdev >= %{lbd_version} +Requires: %{libudisks} = %{version} +Requires: libblockdev-kbd >= %{libblockdev_version} +Requires: libblockdev-swap >= %{libblockdev_version} -%description -n %{libname}_zram +%description -n %{libudisks}_zram This package contains the UDisks' module for zram support. %lang_package @@ -202,8 +217,8 @@ mkdir -p %{buildroot}/%{_sbindir} ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name} -%post -n %{libname}-%{somajor} -p /sbin/ldconfig -%postun -n %{libname}-%{somajor} -p /sbin/ldconfig +%post -n %{libudisks} -p /sbin/ldconfig +%postun -n %{libudisks} -p /sbin/ldconfig %pre -n %{name} %service_add_pre udisks2.service @@ -222,20 +237,19 @@ %service_del_postun udisks2.service %service_del_postun [email protected] -%pre -n %{libname}_zram +%pre -n %{libudisks}_zram %service_add_pre [email protected] -%post -n %{libname}_zram +%post -n %{libudisks}_zram %service_add_post [email protected] -%preun -n %{libname}_zram +%preun -n %{libudisks}_zram %service_del_preun [email protected] -%postun -n %{libname}_zram +%postun -n %{libudisks}_zram %service_del_postun [email protected] %files -%defattr(-,root,root,-) %doc AUTHORS NEWS %{_bindir}/udisksctl %config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf @@ -259,17 +273,14 @@ # about e.g. mounts to unprivileged users %attr(0700,root,root) %dir %{_localstatedir}/lib/udisks2 -%files -n %{libname}-%{somajor} -%defattr(-,root,root,-) +%files -n %{libudisks} %license COPYING %{_libdir}/libudisks2.so.* %files -n typelib-1_0-UDisks-2_0 -%defattr(-,root,root,-) %{_libdir}/girepository-1.0/UDisks-2.0.typelib -%files -n %{libname}-devel -%defattr(-,root,root,-) +%files -n %{libudisks}-devel %doc HACKING README.md %doc %{_datadir}/gtk-doc/html/udisks2/ %{_libdir}/libudisks2.so @@ -279,37 +290,32 @@ %{_libdir}/pkgconfig/udisks2.pc %{_datadir}/gir-1.0/UDisks-2.0.gir -%files -n %{libname}_bcache -%defattr(-,root,root,-) +%files -n %{libudisks}_bcache %dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2/modules %{_libdir}/udisks2/modules/libudisks2_bcache.so %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.bcache.policy -%files -n %{libname}_btrfs -%defattr(-,root,root,-) +%files -n %{libudisks}_btrfs %dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2/modules %{_libdir}/udisks2/modules/libudisks2_btrfs.so %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.btrfs.policy -%files -n %{libname}_lsm -%defattr(-,root,root,-) +%files -n %{libudisks}_lsm %dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2/modules %{_libdir}/udisks2/modules/libudisks2_lsm.so %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lsm.policy %{_mandir}/man5/udisks2_lsm.conf.5%{?ext_man} -%files -n %{libname}_lvm2 -%defattr(-,root,root,-) +%files -n %{libudisks}_lvm2 %dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2/modules %{_libdir}/udisks2/modules/libudisks2_lvm2.so %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy -%files -n %{libname}_zram -%defattr(-,root,root,-) +%files -n %{libudisks}_zram %dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2/modules %{_libdir}/udisks2/modules/libudisks2_zram.so
