pool/udisks2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 596360 from home:luc14n0:Factory

Browse Source 
Require specific libblockdev plugins in due udisks2's modules, following libblockdev's plugins split (bsc#1086447).

OBS-URL: https://build.opensuse.org/request/show/596360
OBS-URL: https://build.opensuse.org/package/show/Base:System/udisks2?expand=0&rev=62
This commit is contained in:
Dominique Leuenberger 2018-04-16 16:53:51 +00:00 committed by Git OBS Bridge
parent 8d03ed5dc9
commit 4b977ca569
2 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
udisks2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Mar 28 02:56:37 UTC 2018 - luc14n0@linuxmail.org
- 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.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 00:34:27 UTC 2018 - luc14n0@linuxmail.org Tue Mar 6 00:34:27 UTC 2018 - luc14n0@linuxmail.org

116
udisks2.spec
View File

@ -17,8 +17,9 @@
%define somajor 0 %define somajor 0
%define libname lib%{name} %define libudisks lib%{name}-%{somajor}
%define lbd_version 2.14 %define libblockdev_version 2.14
Name: udisks2 Name: udisks2
Version: 2.7.6 Version: 2.7.6
Release: 0 Release: 0
@ -29,12 +30,21 @@ URL: https://github.com/storaged-project/udisks
Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: gobject-introspection-devel >= 1.30.0 BuildRequires: gobject-introspection-devel >= 0.6.2
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libacl-devel 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: lvm2-devel
BuildRequires: open-iscsi-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xsltproc BuildRequires: xsltproc
BuildRequires: pkgconfig(blkid) >= 2.17.0 BuildRequires: pkgconfig(blkid) >= 2.17.0
@ -52,7 +62,7 @@ BuildRequires: pkgconfig(polkit-agent-1) >= 0.102
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(udev)
Requires: %{libname}-%{somajor} = %{version} Requires: %{libudisks} = %{version}
# For LUKS devices # For LUKS devices
Requires: cryptsetup Requires: cryptsetup
# Needed to pull in the system bus daemon # Needed to pull in the system bus daemon
@ -67,7 +77,12 @@ Requires: eject
Requires: gptfdisk Requires: gptfdisk
# We need at least this version for bugfixes/features etc. # We need at least this version for bugfixes/features etc.
Requires: libatasmart-utils >= 0.17 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 # Needed to pull in the udev daemon
Requires: udev >= 208 Requires: udev >= 208
# For mount, umount, mkswap # For mount, umount, mkswap
@ -75,7 +90,7 @@ Requires: util-linux
# For mkfs.xfs, xfs_admin # For mkfs.xfs, xfs_admin
Requires: xfsprogs Requires: xfsprogs
Recommends: %{name}-lang Recommends: %{name}-lang
Recommends: %{libname}_btrfs Recommends: %{libudisks}_btrfs
%{?systemd_requires} %{?systemd_requires}
# Upstream First - Policy: # Upstream First - Policy:
# Never add any patches to this package without the upstream commit id # Never add any patches to this package without the upstream commit id
@ -86,12 +101,12 @@ Recommends: %{libname}_btrfs
The Udisks project provides a daemon, tools and libraries to access and The Udisks project provides a daemon, tools and libraries to access and
manipulate disks, storage devices and technologies. manipulate disks, storage devices and technologies.
%package -n %{libname}-%{somajor} %package -n %{libudisks}
Summary: Dynamic library to access the UDisksd daemon Summary: Dynamic library to access the UDisksd daemon
License: LGPL-2.0-or-later License: LGPL-2.0-or-later
Group: System/Libraries Group: System/Libraries
%description -n %{libname}-%{somajor} %description -n %{libudisks}
This package contains the dynamic library, which provides This package contains the dynamic library, which provides
access to the UDisksd daemon. access to the UDisksd daemon.
@ -107,66 +122,66 @@ for managing disks and storage devices.
This package provides the GObject Introspection bindings for This package provides the GObject Introspection bindings for
the UDisks client library. the UDisks client library.
%package -n %{libname}-devel %package -n %{libudisks}-devel
Summary: Development files for %{libname} Summary: Development files for UDisks
License: LGPL-2.0-or-later License: LGPL-2.0-or-later
Group: Development/Libraries/C and C++ 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 This package contains the development files for the library libUDisks2, a
dynamic library, which provides access to the UDisksd daemon. dynamic library, which provides access to the UDisksd daemon.
%package -n %{libname}_bcache %package -n %{libudisks}_bcache
Summary: UDisks module for Bcache Summary: UDisks module for Bcache
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Libraries Group: System/Libraries
Requires: %{libname}-%{somajor} >= %{version} Requires: %{libudisks} >= %{version}
Requires: libblockdev >= %{lbd_version} Requires: libblockdev-kbd >= %{libblockdev_version}
%description -n %{libname}_bcache %description -n %{libudisks}_bcache
This package contains the UDisks' module for bcache support. This package contains the UDisks' module for bcache support.
%package -n %{libname}_btrfs %package -n %{libudisks}_btrfs
Summary: UDisks module for btrfs Summary: UDisks module for btrfs
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Libraries Group: System/Libraries
Requires: %{libname}-%{somajor} >= %{version} Requires: %{libudisks} >= %{version}
Requires: libblockdev >= %{lbd_version} Requires: libblockdev-btrfs >= %{libblockdev_version}
%description -n %{libname}_btrfs %description -n %{libudisks}_btrfs
This package contains the UDisks' module for btrfs support. This package contains the UDisks' module for btrfs support.
%package -n %{libname}_lsm %package -n %{libudisks}_lsm
Summary: UDisks module for LSM Summary: UDisks module for LSM
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Libraries Group: System/Libraries
Requires: %{libname}-%{somajor} >= %{version} Requires: %{libudisks} >= %{version}
Requires: libblockdev >= %{lbd_version}
Requires: libstoragemgmt >= 1.3.0 Requires: libstoragemgmt >= 1.3.0
%description -n %{libname}_lsm %description -n %{libudisks}_lsm
This package contains the UDisks' module for lsm support. This package contains the UDisks' module for lsm support.
%package -n %{libname}_lvm2 %package -n %{libudisks}_lvm2
Summary: UDisks module for LVM2 Summary: UDisks module for LVM2
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Libraries Group: System/Libraries
Requires: %{libname}-%{somajor} >= %{version} Requires: %{libudisks} >= %{version}
Requires: libblockdev >= %{lbd_version} Requires: libblockdev-lvm >= %{libblockdev_version}
Requires: lvm2 Requires: lvm2
%description -n %{libname}_lvm2 %description -n %{libudisks}_lvm2
This package contains the UDisks' module for LVM2 support. This package contains the UDisks' module for LVM2 support.
%package -n %{libname}_zram %package -n %{libudisks}_zram
Summary: UDisks module for Zram Summary: UDisks module for Zram
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Libraries Group: System/Libraries
Requires: %{libname}-%{somajor} = %{version} Requires: %{libudisks} = %{version}
Requires: libblockdev >= %{lbd_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. This package contains the UDisks' module for zram support.
%lang_package %lang_package
@ -202,8 +217,8 @@ rm -r %{buildroot}%{_sysconfdir}/udisks2
mkdir -p %{buildroot}/%{_sbindir} mkdir -p %{buildroot}/%{_sbindir}
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name} ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
%post -n %{libname}-%{somajor} -p /sbin/ldconfig %post -n %{libudisks} -p /sbin/ldconfig
%postun -n %{libname}-%{somajor} -p /sbin/ldconfig %postun -n %{libudisks} -p /sbin/ldconfig
%pre -n %{name} %pre -n %{name}
%service_add_pre udisks2.service %service_add_pre udisks2.service
@ -222,20 +237,19 @@ ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
%service_del_postun udisks2.service %service_del_postun udisks2.service
%service_del_postun clean-mount-point@.service %service_del_postun clean-mount-point@.service
%pre -n %{libname}_zram %pre -n %{libudisks}_zram
%service_add_pre zram-setup@.service %service_add_pre zram-setup@.service
%post -n %{libname}_zram %post -n %{libudisks}_zram
%service_add_post zram-setup@.service %service_add_post zram-setup@.service
%preun -n %{libname}_zram %preun -n %{libudisks}_zram
%service_del_preun zram-setup@.service %service_del_preun zram-setup@.service
%postun -n %{libname}_zram %postun -n %{libudisks}_zram
%service_del_postun zram-setup@.service %service_del_postun zram-setup@.service
%files %files
%defattr(-,root,root,-)
%doc AUTHORS NEWS %doc AUTHORS NEWS
%{_bindir}/udisksctl %{_bindir}/udisksctl
%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf %config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
@ -259,17 +273,14 @@ ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
# about e.g. mounts to unprivileged users # about e.g. mounts to unprivileged users
%attr(0700,root,root) %dir %{_localstatedir}/lib/udisks2 %attr(0700,root,root) %dir %{_localstatedir}/lib/udisks2
%files -n %{libname}-%{somajor} %files -n %{libudisks}
%defattr(-,root,root,-)
%license COPYING %license COPYING
%{_libdir}/libudisks2.so.* %{_libdir}/libudisks2.so.*
%files -n typelib-1_0-UDisks-2_0 %files -n typelib-1_0-UDisks-2_0
%defattr(-,root,root,-)
%{_libdir}/girepository-1.0/UDisks-2.0.typelib %{_libdir}/girepository-1.0/UDisks-2.0.typelib
%files -n %{libname}-devel %files -n %{libudisks}-devel
%defattr(-,root,root,-)
%doc HACKING README.md %doc HACKING README.md
%doc %{_datadir}/gtk-doc/html/udisks2/ %doc %{_datadir}/gtk-doc/html/udisks2/
%{_libdir}/libudisks2.so %{_libdir}/libudisks2.so
@ -279,37 +290,32 @@ ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
%{_libdir}/pkgconfig/udisks2.pc %{_libdir}/pkgconfig/udisks2.pc
%{_datadir}/gir-1.0/UDisks-2.0.gir %{_datadir}/gir-1.0/UDisks-2.0.gir
%files -n %{libname}_bcache %files -n %{libudisks}_bcache
%defattr(-,root,root,-)
%dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/modules %dir %{_libdir}/udisks2/modules
%{_libdir}/udisks2/modules/libudisks2_bcache.so %{_libdir}/udisks2/modules/libudisks2_bcache.so
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.bcache.policy %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.bcache.policy
%files -n %{libname}_btrfs %files -n %{libudisks}_btrfs
%defattr(-,root,root,-)
%dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/modules %dir %{_libdir}/udisks2/modules
%{_libdir}/udisks2/modules/libudisks2_btrfs.so %{_libdir}/udisks2/modules/libudisks2_btrfs.so
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.btrfs.policy %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.btrfs.policy
%files -n %{libname}_lsm %files -n %{libudisks}_lsm
%defattr(-,root,root,-)
%dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/modules %dir %{_libdir}/udisks2/modules
%{_libdir}/udisks2/modules/libudisks2_lsm.so %{_libdir}/udisks2/modules/libudisks2_lsm.so
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lsm.policy %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lsm.policy
%{_mandir}/man5/udisks2_lsm.conf.5%{?ext_man} %{_mandir}/man5/udisks2_lsm.conf.5%{?ext_man}
%files -n %{libname}_lvm2 %files -n %{libudisks}_lvm2
%defattr(-,root,root,-)
%dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/modules %dir %{_libdir}/udisks2/modules
%{_libdir}/udisks2/modules/libudisks2_lvm2.so %{_libdir}/udisks2/modules/libudisks2_lvm2.so
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy
%files -n %{libname}_zram %files -n %{libudisks}_zram
%defattr(-,root,root,-)
%dir %{_libdir}/udisks2 %dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/modules %dir %{_libdir}/udisks2/modules
%{_libdir}/udisks2/modules/libudisks2_zram.so %{_libdir}/udisks2/modules/libudisks2_zram.so