Update to upstream 2.8.0 release
This commit is contained in:
Tomas Bzatek
parent
006dd9e3ff
commit
9699a35ff8
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
||||
/udisks-2.7.5.tar.bz2
|
||||
/udisks-2.7.6.tar.bz2
|
||||
/udisks-2.7.7.tar.bz2
|
||||
/udisks-2.8.0.tar.bz2
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (udisks-2.7.7.tar.bz2) = f679feb10a4a569445538a835fc573035639ace7821b4319d2ff5be801145d74966f3bbd8c90afbd4ab02bee552af23fa23db55a5d3e7699d41a15df3477008e
|
||||
SHA512 (udisks-2.8.0.tar.bz2) = 3814c4c02fbadc58d9e3a6615f015d385648211f12075ce46eb0016605f102fa0c8eeca152f2e03491522b484c43039901bf8f1be2f469ac35b1b6259e7e0ceb
|
||||
|
||||
120
udisks2.spec
120
udisks2.spec
@ -5,17 +5,58 @@
|
||||
%global libatasmart_version 0.17
|
||||
%global dbus_version 1.4.0
|
||||
%global with_gtk_doc 1
|
||||
%global libblockdev_version 2.18
|
||||
%global libblockdev_version 2.19
|
||||
|
||||
%define with_bcache 1
|
||||
%define with_btrfs 1
|
||||
%define with_vdo 1
|
||||
%define with_lsm 1
|
||||
%define with_zram 1
|
||||
%define with_lvmcache 1
|
||||
|
||||
# valid options are 'luks1' or 'luks2'
|
||||
%define default_luks_encryption luks1
|
||||
|
||||
%define is_fedora 0%{?rhel} == 0
|
||||
%define is_git %(git show > /dev/null 2>&1 && echo 1 || echo 0)
|
||||
%define git_hash %(git log -1 --pretty=format:"%h" || true)
|
||||
%define build_date %(date '+%Y%m%d')
|
||||
|
||||
|
||||
# bcache is not available on RHEL
|
||||
%if (0%{?rhel}) || %{with_bcache} == 0
|
||||
%define with_bcache 0
|
||||
%endif
|
||||
|
||||
# btrfs is not available on RHEL > 7
|
||||
%if 0%{?rhel} > 7 || %{with_btrfs} == 0
|
||||
%define with_btrfs 0
|
||||
%endif
|
||||
|
||||
# vdo is not available on Fedora
|
||||
%if (0%{?fedora}) || %{with_vdo} == 0
|
||||
%define with_vdo 0
|
||||
%endif
|
||||
|
||||
# vdo is not available on i686
|
||||
%ifnarch x86_64 aarch64 ppc64le s390x
|
||||
%define with_vdo 0
|
||||
%endif
|
||||
|
||||
# feature parity with existing RHEL 7 packages
|
||||
%if (0%{?rhel}) && (0%{?rhel} <= 7)
|
||||
%define with_lsm 0
|
||||
%define with_zram 0
|
||||
%define with_lvmcache 0
|
||||
%endif
|
||||
|
||||
# default to LUKS2 for RHEL > 7
|
||||
%if 0%{?rhel} > 7
|
||||
%define default_luks_encryption luks2
|
||||
%endif
|
||||
|
||||
|
||||
Name: udisks2
|
||||
Summary: Disk Manager
|
||||
Version: 2.7.7
|
||||
Release: 3%{?dist}
|
||||
Version: 2.8.0
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Libraries
|
||||
URL: https://github.com/storaged-project/udisks
|
||||
@ -144,7 +185,7 @@ Obsoletes: libstoraged-devel
|
||||
This package contains the development files for the library lib%{name}, a
|
||||
dynamic library, which provides access to the udisksd daemon.
|
||||
|
||||
%if %{is_fedora}
|
||||
%if 0%{?with_bcache}
|
||||
%package -n %{name}-bcache
|
||||
Summary: Module for Bcache
|
||||
Group: System Environment/Libraries
|
||||
@ -157,7 +198,9 @@ Obsoletes: storaged-bcache
|
||||
|
||||
%description -n %{name}-bcache
|
||||
This package contains module for Bcache configuration.
|
||||
%endif
|
||||
|
||||
%if 0%{?with_btrfs}
|
||||
%package -n %{name}-btrfs
|
||||
Summary: Module for BTRFS
|
||||
Group: System Environment/Libraries
|
||||
@ -170,7 +213,9 @@ Obsoletes: storaged-btrfs
|
||||
|
||||
%description -n %{name}-btrfs
|
||||
This package contains module for BTRFS configuration.
|
||||
%endif
|
||||
|
||||
%if 0%{?with_lsm}
|
||||
%package -n %{name}-lsm
|
||||
Summary: Module for LSM
|
||||
Group: System Environment/Libraries
|
||||
@ -184,7 +229,9 @@ Obsoletes: storaged-lsm
|
||||
|
||||
%description -n %{name}-lsm
|
||||
This package contains module for LSM configuration.
|
||||
%endif
|
||||
|
||||
%if 0%{?with_zram}
|
||||
%package -n %{name}-zram
|
||||
Summary: Module for ZRAM
|
||||
Group: System Environment/Libraries
|
||||
@ -201,11 +248,27 @@ Obsoletes: storaged-zram
|
||||
This package contains module for ZRAM configuration.
|
||||
%endif
|
||||
|
||||
%if 0%{?with_vdo}
|
||||
%package -n %{name}-vdo
|
||||
Summary: Module for VDO
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: vdo
|
||||
Requires: libblockdev-vdo >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-vdo-devel >= %{libblockdev_version}
|
||||
|
||||
%description -n %{name}-vdo
|
||||
This package contains module for VDO management.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n udisks-%{version}
|
||||
sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/"
|
||||
|
||||
%build
|
||||
autoreconf -ivf
|
||||
# modules need to be explicitly enabled
|
||||
%configure \
|
||||
--sysconfdir=/etc \
|
||||
%if %{with_gtk_doc}
|
||||
@ -213,12 +276,26 @@ autoreconf -ivf
|
||||
%else
|
||||
--disable-gtk-doc \
|
||||
%endif
|
||||
%if %{is_fedora}
|
||||
--enable-modules
|
||||
%else
|
||||
--enable-iscsi \
|
||||
--enable-lvm2
|
||||
%if 0%{?with_bcache}
|
||||
--enable-bcache \
|
||||
%endif
|
||||
%if 0%{?with_btrfs}
|
||||
--enable-btrfs \
|
||||
%endif
|
||||
%if 0%{?with_vdo}
|
||||
--enable-vdo \
|
||||
%endif
|
||||
%if 0%{?with_zram}
|
||||
--enable-zram \
|
||||
%endif
|
||||
%if 0%{?with_lsm}
|
||||
--enable-lsm \
|
||||
%endif
|
||||
%if 0%{?with_lvmcache}
|
||||
--enable-lvmcache \
|
||||
%endif
|
||||
--enable-lvm2 \
|
||||
--enable-iscsi
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -251,7 +328,7 @@ udevadm trigger
|
||||
|
||||
%ldconfig_scriptlets -n lib%{name}
|
||||
|
||||
%if %{is_fedora}
|
||||
%if 0%{?with_zram}
|
||||
%post -n %{name}-zram
|
||||
%systemd_post zram-setup@.service
|
||||
|
||||
@ -324,22 +401,28 @@ udevadm trigger
|
||||
%endif
|
||||
%{_libdir}/pkgconfig/udisks2.pc
|
||||
|
||||
%if %{is_fedora}
|
||||
%if 0%{?with_bcache}
|
||||
%files -n %{name}-bcache
|
||||
%{_libdir}/udisks2/modules/libudisks2_bcache.so
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.bcache.policy
|
||||
%endif
|
||||
|
||||
%if 0%{?with_btrfs}
|
||||
%files -n %{name}-btrfs
|
||||
%{_libdir}/udisks2/modules/libudisks2_btrfs.so
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.btrfs.policy
|
||||
%endif
|
||||
|
||||
%if 0%{?with_lsm}
|
||||
%files -n %{name}-lsm
|
||||
%dir %{_sysconfdir}/udisks2/modules.conf.d
|
||||
%{_libdir}/udisks2/modules/libudisks2_lsm.so
|
||||
%{_mandir}/man5/udisks2_lsm.conf.*
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lsm.policy
|
||||
%attr(0600,root,root) %{_sysconfdir}/udisks2/modules.conf.d/udisks2_lsm.conf
|
||||
%endif
|
||||
|
||||
%if 0%{?with_zram}
|
||||
%files -n %{name}-zram
|
||||
%dir %{_sysconfdir}/udisks2/modules.conf.d
|
||||
%{_libdir}/udisks2/modules/libudisks2_zram.so
|
||||
@ -347,7 +430,16 @@ udevadm trigger
|
||||
%{_unitdir}/zram-setup@.service
|
||||
%endif
|
||||
|
||||
%if 0%{?with_vdo}
|
||||
%files -n %{name}-vdo
|
||||
%{_libdir}/udisks2/modules/libudisks2_vdo.so
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.vdo.policy
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Aug 13 2018 Tomas Bzatek <tbzatek@redhat.com> - 2.8.0-1
|
||||
- Version 2.8.0
|
||||
|
||||
* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 2.7.7-3
|
||||
- Rebuild for new libconfig
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user