Accepting request 583197 from home:luc14n0:Factory

Fixes run time dependencies and do some enhacements.

OBS-URL: https://build.opensuse.org/request/show/583197
OBS-URL: https://build.opensuse.org/package/show/Base:System/udisks2?expand=0&rev=60

udisks2.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Mar  6 00:34:27 UTC 2018 - luc14n0@linuxmail.org
+
+- Fix BuildRequires/Requires tags related to libblockdev and
+  libatasmart dependencies.
+- Drop storaged Provides tags since there is no need for them.
+- Switch libconfig-devel and libstoragemgmt-devel BuildRequires by
+  their pkgconfig modules counterparts.
+- Add a Recommends tag for the btrfs module to offer support for
+  the openSUSE's file system of choice by default.
+
 -------------------------------------------------------------------
 Thu Mar  1 14:32:37 UTC 2018 - jengelh@inai.de
 

udisks2.spec

@@ -19,14 +19,13 @@
 %define somajor 0
 %define libname lib%{name}
 %define lbd_version 2.14
-
 Name:           udisks2
+Version:        2.7.6
+Release:        0
 Summary:        Disk Manager
 License:        GPL-2.0-or-later AND LGPL-2.0-or-later
 Group:          System/Daemons
-Version:        2.7.6
+URL:            https://github.com/storaged-project/udisks
-Release:        0
-Url:            https://github.com/storaged-project/udisks
 Source0:        https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
 BuildRequires:  chrpath
 BuildRequires:  docbook-xsl-stylesheets
@@ -34,18 +33,9 @@ BuildRequires:  gobject-introspection-devel >= 1.30.0
 BuildRequires:  gtk-doc
 BuildRequires:  intltool
 BuildRequires:  libacl-devel
-BuildRequires:  libbd_btrfs-devel >= %{lbd_version}
+BuildRequires:  libblockdev-devel >= %{lbd_version}
-BuildRequires:  libbd_crypto-devel >= %{lbd_version}
-BuildRequires:  libbd_fs-devel >= %{lbd_version}
-BuildRequires:  libbd_kbd-devel >= %{lbd_version}
-BuildRequires:  libbd_loop-devel >= %{lbd_version}
-BuildRequires:  libbd_lvm-devel >= %{lbd_version}
-BuildRequires:  libbd_mdraid-devel >= %{lbd_version}
-BuildRequires:  libbd_part-devel >= %{lbd_version}
-BuildRequires:  libbd_swap-devel >= %{lbd_version}
-BuildRequires:  libconfig-devel >= 1.3.2
-BuildRequires:  libstoragemgmt-devel >= 1.3.0
 BuildRequires:  lvm2-devel
+BuildRequires:  pkgconfig
 BuildRequires:  xsltproc
 BuildRequires:  pkgconfig(blkid) >= 2.17.0
 BuildRequires:  pkgconfig(blockdev) >= 2.14
@@ -54,47 +44,39 @@ BuildRequires:  pkgconfig(glib-2.0) >= 2.50
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gudev-1.0) >= 165
 BuildRequires:  pkgconfig(libatasmart) >= 0.17
+BuildRequires:  pkgconfig(libconfig) >= 1.3.2
+BuildRequires:  pkgconfig(libstoragemgmt) >= 1.3.0
 BuildRequires:  pkgconfig(libsystemd) >= 209
 BuildRequires:  pkgconfig(mount) >= 2.30
 BuildRequires:  pkgconfig(polkit-agent-1) >= 0.102
 BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.102
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
-Requires:       libbd_crypto >= %{lbd_version}
+Requires:       %{libname}-%{somajor} = %{version}
-Requires:       libbd_fs >= %{lbd_version}
-Requires:       libbd_loop >= %{lbd_version}
-Requires:       libbd_mdraid >= %{lbd_version}
-Requires:       libbd_part >= %{lbd_version}
-Requires:       libbd_swap >= %{lbd_version}
-# Needed to pull in the system bus daemon
-Requires:       dbus >= 1.4.0
-# Needed to pull in the udev daemon
-Requires:       udev >= 208
-# We need at least this version for bugfixes/features etc.
-Requires:       libatasmart >= 0.17
-# For mount, umount, mkswap
-Requires:       util-linux
-# sgdisk is called by udisksd to modify the partition tables... thus a needed tool.
-Requires:       gptfdisk
 # For LUKS devices
 Requires:       cryptsetup
-# For mkfs.ext3, mkfs.ext3, e2label
+# Needed to pull in the system bus daemon
-Requires:       e2fsprogs
+Requires:       dbus-1 >= 1.4.0
-# For mkfs.xfs, xfs_admin
-Requires:       xfsprogs
 # For mkfs.vfat
 Requires:       dosfstools
+# For mkfs.ext3, mkfs.ext3, e2label
+Requires:       e2fsprogs
 # For ejecting removable disks
-Requires:       %{libname}-%{somajor} = %{version}
 Requires:       eject
+# sgdisk is called by udisksd to modify the partition tables... thus a needed tool.
+Requires:       gptfdisk
+# We need at least this version for bugfixes/features etc.
+Requires:       libatasmart-utils >= 0.17
+Requires:       libblockdev >= %{lbd_version}
+# Needed to pull in the udev daemon
+Requires:       udev >= 208
+# For mount, umount, mkswap
+Requires:       util-linux
+# For mkfs.xfs, xfs_admin
+Requires:       xfsprogs
 Recommends:     %{name}-lang
-Provides:       storaged = %{version}
+Recommends:     %{libname}_btrfs
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
-
-# For /proc/self/mountinfo, only available in 2.6.26 or higher
-Conflicts:      kernel < 2.6.26
-
 # Upstream First - Policy:
 # Never add any patches to this package without the upstream commit id
 # in the patch. Any patches added here without a very good reason to make
@@ -108,7 +90,6 @@ manipulate disks, storage devices and technologies.
 Summary:        Dynamic library to access the UDisksd daemon
 License:        LGPL-2.0-or-later
 Group:          System/Libraries
-Provides:       libstoraged = %{version}
 
 %description -n %{libname}-%{somajor}
 This package contains the dynamic library, which provides
@@ -130,8 +111,7 @@ the UDisks client library.
 Summary:        Development files for %{libname}
 License:        LGPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       %{libname}-%{somajor} = %{version}
+Requires:       %{libname}-%{somajor} >= %{version}
-Provides:       libstoraged-devel = %{version}
 
 %description -n %{libname}-devel
 This package contains the development files for the library libUDisks2, a
@@ -142,8 +122,7 @@ Summary:        UDisks module for Bcache
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 Requires:       %{libname}-%{somajor} >= %{version}
-Requires:       libbd_kbd >= %{lbd_version}
+Requires:       libblockdev >= %{lbd_version}
-Provides:       storaged-bcache = %{version}
 
 %description -n %{libname}_bcache
 This package contains the UDisks' module for bcache support.
@@ -153,8 +132,7 @@ Summary:        UDisks module for btrfs
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 Requires:       %{libname}-%{somajor} >= %{version}
-Requires:       libbd_btrfs >= %{lbd_version}
+Requires:       libblockdev >= %{lbd_version}
-Provides:       storaged-btrfs = %{version}
 
 %description -n %{libname}_btrfs
 This package contains the UDisks' module for btrfs support.
@@ -164,8 +142,8 @@ Summary:        UDisks module for LSM
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 Requires:       %{libname}-%{somajor} >= %{version}
+Requires:       libblockdev >= %{lbd_version}
 Requires:       libstoragemgmt >= 1.3.0
-Provides:       storaged-lsm = %{version}
 
 %description -n %{libname}_lsm
 This package contains the UDisks' module for lsm support.
@@ -175,9 +153,8 @@ Summary:        UDisks module for LVM2
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 Requires:       %{libname}-%{somajor} >= %{version}
-Requires:       libbd_lvm >= %{lbd_version}
+Requires:       libblockdev >= %{lbd_version}
 Requires:       lvm2
-Provides:       storaged-lvm2 = %{version}
 
 %description -n %{libname}_lvm2
 This package contains the UDisks' module for LVM2 support.
@@ -187,9 +164,7 @@ Summary:        UDisks module for Zram
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 Requires:       %{libname}-%{somajor} = %{version}
-Requires:       libbd_kbd >= %{lbd_version}
+Requires:       libblockdev >= %{lbd_version}
-Requires:       libbd_swap >= %{lbd_version}
-Provides:       storaged-zram = %{version}
 
 %description -n %{libname}_zram
 This package contains the UDisks' module for zram support.
@@ -197,7 +172,7 @@ This package contains the UDisks' module for zram support.
 %lang_package
 
 %prep
-%setup -qn udisks-%{version}
+%setup -q -n udisks-%{version}
 
 %build
 %configure                      \
@@ -221,7 +196,7 @@ chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd
 %find_lang udisks2
 
 # Loading storaged modules is not wanted.
-rm -r %{buildroot}/etc/udisks2
+rm -r %{buildroot}%{_sysconfdir}/udisks2
 
 # Create udisks2 rclink
 mkdir -p %{buildroot}/%{_sbindir}