From 1fe613ca0c01694ace09ea7f630ac441cafe3c6c Mon Sep 17 00:00:00 2001 From: Zhiqiang Liu Date: Mon, 21 Nov 2022 15:24:35 +0800 Subject: [PATCH 1/3] udisk2: remove useless 'openeuler' version check fix issue:https://gitee.com/src-openeuler/udisks2/issues/I50LIK 'openEuler' is os-release name of openeuler OS. In udisks2.spec, we use 'openeuler' rather than 'openEuler', which is useless. Here, we just remove all 'openeuler' in udisks2.spec. Signed-off-by: Zhiqiang Liu --- udisks2.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/udisks2.spec b/udisks2.spec index f76f504..37060ad 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 @@ -436,6 +436,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 -- Gitee From d666d7a29716562e73d31ff2332fb851cfa8ca25 Mon Sep 17 00:00:00 2001 From: liuzhiqiang Date: Tue, 3 Jan 2023 06:29:28 +0000 Subject: [PATCH 2/3] update udisks2.spec. Signed-off-by: liuzhiqiang --- udisks2.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/udisks2.spec b/udisks2.spec index 37060ad..3046302 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -256,6 +256,10 @@ 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 + %build autoreconf -ivf # modules need to be explicitly enabled -- Gitee From 2851cc9519d58304e3b9e175ad9b9a9a1f52bb03 Mon Sep 17 00:00:00 2001 From: liuzhiqiang Date: Tue, 3 Jan 2023 07:09:21 +0000 Subject: [PATCH 3/3] update udisks2.spec. Signed-off-by: liuzhiqiang --- udisks2.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/udisks2.spec b/udisks2.spec index 3046302..b86269f 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -260,6 +260,10 @@ sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_e 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 -- Gitee