From 99deb0b3c7ef170d02c6992751a4116536140fa5 Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Wed, 16 Aug 2023 07:53:02 +0000 Subject: [PATCH] LU-17028 build: add support for openEuler 20.03 LTS Add build support for openEuler 20.03 LTS. And e2fsprogs rpm conflicts with openEuler's e2fsprogs-help man rpm, should obsolete to replace it. Signed-off-by: Xinliang Liu Change-Id: I12348e02cfec918167b1949205b86274a1651c27 Reviewed-on: https://review.whamcloud.com/c/tools/e2fsprogs/+/51956 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- contrib/build-rpm | 2 +- e2fsprogs-RHEL-7+.spec.in | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/build-rpm b/contrib/build-rpm index d9018ef..479290e 100644 --- a/contrib/build-rpm +++ b/contrib/build-rpm @@ -75,7 +75,7 @@ if [ -z "$RELEASE" ]; then fi case "$DISTRO-$RELEASE" in AlmaLinux-[89]*) DISTRO=RHEL; RELEASE=7+;; - openEuler-2[2-9]*) DISTRO=RHEL; RELEASE=7+;; + openEuler-2[0-9]*) DISTRO=RHEL; RELEASE=7+;; RedHatEnterpriseServer-6*|CentOS-6*|Fedora-1[1-4]) DISTRO=RHEL; RELEASE=6;; RedHatEnterpriseServer-7*|Fedora-[1-3][0-9]) DISTRO=RHEL; RELEASE=7+;; RedHatEnterprise-[89]*|CentOS-[7-9]*) DISTRO=RHEL; RELEASE=7+;; diff --git a/e2fsprogs-RHEL-7+.spec.in b/e2fsprogs-RHEL-7+.spec.in index c930a1f..a42250a 100644 --- a/e2fsprogs-RHEL-7+.spec.in +++ b/e2fsprogs-RHEL-7+.spec.in @@ -21,6 +21,10 @@ Obsoletes: e4fsprogs < %{version}-%{release} Provides: e4fsprogs = %{version}-%{release} %endif +%if 0%{?openEuler} +Obsoletes: e2fsprogs-help < %{version} +%endif + BuildRequires: pkgconfig, texinfo, libselinux-devel, gcc BuildRequires: libsepol-devel BuildRequires: libblkid-devel -- 1.8.3.1