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 <xinliang.liu@linaro.org>
Change-Id: I12348e02cfec918167b1949205b86274a1651c27
Reviewed-on: https://review.whamcloud.com/c/tools/e2fsprogs/+/51956
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/contrib/build-rpm b/contrib/build-rpm
index cfe802d..dd56a5d 100644 (file)
--- a/contrib/build-rpm
+++ b/contrib/build-rpm
@@ -74,7 +74,7 @@ if [ -z "$RELEASE" ]; then
 fi
 case "$DISTRO-$RELEASE" in
     AlmaLinux*) 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;;
     RedHatEnterprise*|Fedora*|CentOS*) DISTRO=RHEL; RELEASE=7+;;
     Rocky*) DISTRO=RHEL; RELEASE=7+;;

diff --git a/e2fsprogs-RHEL-7+.spec.in b/e2fsprogs-RHEL-7+.spec.in
index d75f299..b1263dd 100644 (file)
--- 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