diff --git a/udisks2.spec b/udisks2.spec index f76f5046039a11d19b3a8ea45eed1943c90aa783..b86269fb86c41bfd48c587f581f5d90217bf7f0e 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -17,18 +17,18 @@ # valid options are 'luks1' or 'luks2' %define default_luks_encryption luks1 -%define is_fedora (0%{?rhel} == 0) && (0%{?openeuler} == 0) +%define is_fedora (0%{?rhel} == 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}) || (0%{?openeuler}) || %{with_bcache} == 0 +%if (0%{?rhel}) || %{with_bcache} == 0 %define with_bcache 0 %endif # btrfs is not available on RHEL > 7 -%if 0%{?rhel} > 7 || 0%{?openeuler} || %{with_btrfs} == 0 +%if 0%{?rhel} > 7 || %{with_btrfs} == 0 %define with_btrfs 0 %endif @@ -43,14 +43,14 @@ %endif # feature parity with existing RHEL 7 packages -%if (0%{?rhel}) && (0%{?rhel} <= 7) && (0%{?openeuler} == 0) +%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 || 0%{?openeuler} +%if 0%{?rhel} > 7 %define default_luks_encryption luks2 %endif @@ -58,7 +58,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.9.4 -Release: 3 +Release: 4 License: GPL-2.0+ and LGPL-2.0+ Group: System Environment/Libraries URL: https://github.com/storaged-project/udisks @@ -121,7 +121,7 @@ Requires: libmount Requires: lib%{name}%{?_isa} = %{version}-%{release} # For mkntfs (not available on rhel or on ppc/ppc64) -%if ! 0%{?rhel} && ! 0%{?openeuler} +%if ! 0%{?rhel} %ifnarch ppc ppc64 Requires: ntfsprogs %endif @@ -256,6 +256,14 @@ This package contains module for VDO management. %setup -q -n udisks-%{version} sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/" +%if 0%{?openeuler} +echo "lzhq: openeuler:1, realvalue:" 0%{?openeuler} +%endif + +%if 0%{?openEuler} +echo "lzhq: openEuler:1, realvalue:" 0%{?openEuler} +%endif + %build autoreconf -ivf # modules need to be explicitly enabled @@ -436,6 +444,9 @@ udevadm trigger %endif %changelog +* Mon Nov 21 2022 Zhiqiang Liu - 2.9.4-4 +- remove useless 'openeuler' macro in spec file + * Sat Oct 29 2022 wangzhiqiang - 2.9.4-3 - update release