rpms/udisks2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New udisks upstream release 2.7.0

Browse Source
This commit is contained in:
Vojtech Trefny 2017-06-05 08:21:31 +02:00
parent 07f281fb63
commit d0e4accb53
3 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/udisks-2.6.4.tar.bz2 /udisks-2.6.4.tar.bz2
/udisks-2.6.5.tar.bz2 /udisks-2.6.5.tar.bz2
/udisks-2.7.0.tar.bz2

2
sources
View File

@ -1 +1 @@
SHA512 (udisks-2.6.5.tar.bz2) = 19e375aebe63d85c036d231c78dc3d7fb9511da71415e60109da12d7b7c6a687be065e3b98545691d99573cc017c9f964d2dec5301919cce6937fd8c1709b9d5 SHA512 (udisks-2.7.0.tar.bz2) = b04c6c2e40f052a83243f245f60446ef1664e528ee1554f777e89e3eefbcf26dac37ad5db8f255fd7cc2c1cae2813a33c7d51bbca062436785471e69456ffe20

99
udisks2.spec
View File

@ -6,7 +6,7 @@
%global dbus_version 1.4.0 %global dbus_version 1.4.0
%global with_gtk_doc 1 %global with_gtk_doc 1
%global with_libblockdev_part 1 %global with_libblockdev_part 1
%global libblockdev_version 2.1 %global libblockdev_version 2.4
%define is_fedora 0%{?rhel} == 0 %define is_fedora 0%{?rhel} == 0
%define is_git %(git show > /dev/null 2>&1 && echo 1 || echo 0) %define is_git %(git show > /dev/null 2>&1 && echo 1 || echo 0)
@ -15,7 +15,7 @@
Name: udisks2 Name: udisks2
Summary: Disk Manager Summary: Disk Manager
Version: 2.6.5 Version: 2.7.0
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -34,15 +34,30 @@ BuildRequires: chrpath
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: intltool BuildRequires: intltool
BuildRequires: redhat-rpm-config BuildRequires: redhat-rpm-config
BuildRequires: libblockdev-part-devel >= %{libblockdev_version} BuildRequires: libblockdev-devel >= %{libblockdev_version}
BuildRequires: libblockdev-btrfs-devel >= %{libblockdev_version} BuildRequires: libblockdev-part-devel >= %{libblockdev_version}
BuildRequires: libblockdev-kbd-devel >= %{libblockdev_version} BuildRequires: libblockdev-loop-devel >= %{libblockdev_version}
BuildRequires: libblockdev-swap-devel >= %{libblockdev_version} BuildRequires: libblockdev-swap-devel >= %{libblockdev_version}
BuildRequires: libblockdev-mdraid-devel >= %{libblockdev_version}
BuildRequires: libblockdev-fs-devel >= %{libblockdev_version}
BuildRequires: libblockdev-crypto-devel >= %{libblockdev_version}
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}
# Needed for the systemd-related macros used in this file
%{?systemd_requires}
BuildRequires: systemd
# Needed to pull in the system bus daemon # Needed to pull in the system bus daemon
Requires: dbus >= %{dbus_version} Requires: dbus >= %{dbus_version}
# Needed to pull in the udev daemon # Needed to pull in the udev daemon
Requires: systemd >= %{systemd_version} Requires: udev >= %{systemd_version}
# We need at least this version for bugfixes/features etc. # We need at least this version for bugfixes/features etc.
Requires: libatasmart >= %{libatasmart_version} Requires: libatasmart >= %{libatasmart_version}
# For mount, umount, mkswap # For mount, umount, mkswap
@ -54,12 +69,8 @@ Requires: xfsprogs
# For mkfs.vfat # For mkfs.vfat
Requires: dosfstools Requires: dosfstools
Requires: gdisk Requires: gdisk
# For LUKS devices
Requires: cryptsetup-luks
# For ejecting removable disks # For ejecting removable disks
Requires: eject Requires: eject
# For MD-RAID
Requires: mdadm
Requires: lib%{name}%{?_isa} = %{version}-%{release} Requires: lib%{name}%{?_isa} = %{version}-%{release}
@ -110,7 +121,9 @@ Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
License: LGPLv2+ License: LGPLv2+
Requires: lvm2 Requires: lvm2
Requires: libblockdev-lvm >= %{libblockdev_version}
BuildRequires: lvm2-devel BuildRequires: lvm2-devel
BuildRequires: libblockdev-lvm-devel >= %{libblockdev_version}
Provides: storaged-lvm2 = %{version}-%{release} Provides: storaged-lvm2 = %{version}-%{release}
Obsoletes: storaged-lvm2 Obsoletes: storaged-lvm2
@ -135,8 +148,8 @@ Summary: Module for Bcache
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
License: LGPLv2+ License: LGPLv2+
Requires: libblockdev-kbd Requires: libblockdev-kbd >= %{libblockdev_version}
BuildRequires: libblockdev-kbd-devel BuildRequires: libblockdev-kbd-devel >= %{libblockdev_version}
Provides: storaged-bcache = %{version}-%{release} Provides: storaged-bcache = %{version}-%{release}
Obsoletes: storaged-bcache Obsoletes: storaged-bcache
@ -148,8 +161,8 @@ Summary: Module for BTRFS
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
License: LGPLv2+ License: LGPLv2+
Requires: libblockdev-btrfs Requires: libblockdev-btrfs >= %{libblockdev_version}
BuildRequires: libblockdev-btrfs-devel BuildRequires: libblockdev-btrfs-devel >= %{libblockdev_version}
Provides: storaged-btrfs = %{version}-%{release} Provides: storaged-btrfs = %{version}-%{release}
Obsoletes: storaged-btrfs Obsoletes: storaged-btrfs
@ -175,9 +188,9 @@ Summary: Module for ZRAM
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
License: LGPLv2+ License: LGPLv2+
Requires: libblockdev-kbd Requires: libblockdev-kbd >= %{libblockdev_version}
Requires: libblockdev-swap Requires: libblockdev-swap >= %{libblockdev_version}
BuildRequires: libblockdev-kbd-devel BuildRequires: libblockdev-kbd-devel >= %{libblockdev_version}
BuildRequires: libblockdev-swap-devel BuildRequires: libblockdev-swap-devel
Provides: storaged-zram = %{version}-%{release} Provides: storaged-zram = %{version}-%{release}
Obsoletes: storaged-zram Obsoletes: storaged-zram
@ -221,15 +234,31 @@ chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd
%find_lang udisks2 %find_lang udisks2
%post -n %{name} %post -n %{name}
%systemd_post udisks2.service
udevadm control --reload udevadm control --reload
udevadm trigger udevadm trigger
# Restart udisks2, if it's running...
systemctl try-restart udisks2 %preun -n %{name}
%systemd_preun udisks2.service
%postun -n %{name}
%systemd_postun_with_restart udisks2.service
%post -n lib%{name} -p /sbin/ldconfig %post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig %postun -n lib%{name} -p /sbin/ldconfig
%if %{is_fedora}
%post -n %{name}-zram
%systemd_post zram-setup@.service
%preun -n %{name}-zram
%systemd_preun zram-setup@.service
%postun -n %{name}-zram
%systemd_postun zram-setup@.service
%endif
%files -f udisks2.lang %files -f udisks2.lang
%doc README.md AUTHORS NEWS HACKING %doc README.md AUTHORS NEWS HACKING
%license COPYING %license COPYING
@ -242,11 +271,13 @@ systemctl try-restart udisks2
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
%{_datadir}/bash-completion/completions/udisksctl %{_datadir}/bash-completion/completions/udisksctl
%{_prefix}/lib/systemd/system/udisks2.service %{_unitdir}/udisks2.service
%{_prefix}/lib/udev/rules.d/80-udisks2.rules %{_udevrulesdir}/80-udisks2.rules
%{_sbindir}/umount.udisks2 %{_sbindir}/umount.udisks2
%dir %{_prefix}/lib/udisks2
%dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/modules
%{_libexecdir}/udisks2/udisksd %{_libexecdir}/udisks2/udisksd
%{_bindir}/udisksctl %{_bindir}/udisksctl
@ -269,19 +300,10 @@ systemctl try-restart udisks2
%{_libdir}/girepository-1.0/UDisks-2.0.typelib %{_libdir}/girepository-1.0/UDisks-2.0.typelib
%files -n %{name}-lvm2 %files -n %{name}-lvm2
%dir %{_prefix}/lib/udisks2
%dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/lvm-nolocking
%dir %{_libdir}/udisks2/modules
%{_prefix}/lib/udisks2/udisks-lvm
%{_libdir}/udisks2/lvm-nolocking/lvm.conf
%{_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
%{_mandir}/man8/udisks-lvm.8*
%files -n %{name}-iscsi %files -n %{name}-iscsi
%dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/modules
%{_libdir}/udisks2/modules/libudisks2_iscsi.so %{_libdir}/udisks2/modules/libudisks2_iscsi.so
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.iscsi.policy %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.iscsi.policy
@ -299,20 +321,14 @@ systemctl try-restart udisks2
%if %{is_fedora} %if %{is_fedora}
%files -n %{name}-bcache %files -n %{name}-bcache
%dir %{_libdir}/udisks2
%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 %{name}-btrfs %files -n %{name}-btrfs
%dir %{_libdir}/udisks2
%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 %{name}-lsm %files -n %{name}-lsm
%dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/modules
%dir %{_sysconfdir}/udisks2/modules.conf.d %dir %{_sysconfdir}/udisks2/modules.conf.d
%{_libdir}/udisks2/modules/libudisks2_lsm.so %{_libdir}/udisks2/modules/libudisks2_lsm.so
%{_mandir}/man5/udisks2_lsm.conf.* %{_mandir}/man5/udisks2_lsm.conf.*
@ -320,15 +336,16 @@ systemctl try-restart udisks2
%attr(0600,root,root) %{_sysconfdir}/udisks2/modules.conf.d/udisks2_lsm.conf %attr(0600,root,root) %{_sysconfdir}/udisks2/modules.conf.d/udisks2_lsm.conf
%files -n %{name}-zram %files -n %{name}-zram
%dir %{_libdir}/udisks2
%dir %{_libdir}/udisks2/modules
%dir %{_sysconfdir}/udisks2/modules.conf.d %dir %{_sysconfdir}/udisks2/modules.conf.d
%{_libdir}/udisks2/modules/libudisks2_zram.so %{_libdir}/udisks2/modules/libudisks2_zram.so
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy
%{_prefix}/lib/systemd/system/zram-setup@.service %{_unitdir}/zram-setup@.service
%endif %endif
%changelog %changelog
* Fri Jun 02 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.0-1
- Version 2.7.0
* Mon May 15 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.6.5-1 * Mon May 15 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.6.5-1
- Version 2.6.5 - Version 2.6.5