From 1e6700be1fe07eeb32a0b2daa09ee5648bf27efd Mon Sep 17 00:00:00 2001
From: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Date: Sun, 30 Jan 2022 10:30:59 +0800
Subject: [PATCH] attr: sync 20.03 LTS branches

Fix issue: https://gitee.com/src-openeuler/attr/issues/I439I9

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
---
 attr.spec | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/attr.spec b/attr.spec
index 55ee423..0be3144 100644
--- a/attr.spec
+++ b/attr.spec
@@ -1,7 +1,7 @@
 %{!?_licensedir:%global license %%doc}
 Name:    attr
 Version: 2.4.48
-Release: 9
+Release: 14
 Summary: Commands for Manipulating Filesystem Extended Attributes
 License: GPLv2+ AND LGPLv2+
 URL:     https://savannah.nongnu.org/projects/attr
@@ -28,7 +28,6 @@ with the SGI IRIX tool of the same name.
 %package -n libattr-devel
 License: LGPLv2+
 Summary: Header files for libattr
-Obsoletes: libattr
 Requires: glibc-headers
 
 %description -n libattr-devel
@@ -69,7 +68,12 @@ ln -fs ../sys/xattr.h $RPM_BUILD_ROOT%{_includedir}/attr/xattr.h
 %find_lang %{name}
 
 %check
-make %{?_smp_mflags} check
+if ./setfattr -n user.name -v value .; then
+    make check || exit $?
+else
+    echo '*** xattrs are probably not supported by the file system,' \
+         'the test-suite will NOT run ***'
+fi
 
 %post -n %{name} -p /sbin/ldconfig
 %postun -n %{name} -p /sbin/ldconfig
@@ -93,6 +97,12 @@ make %{?_smp_mflags} check
 %{_mandir}/man3/*
 
 %changelog
+* Sat Nov 20 2021 yanglongkang <yanglongkang@huawei.com> -2.4.48-14
+- make check add judgment condition
+
+* Tue Feb 9 2021 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 2.4.48-13
+- fix dependency problem and set release num to 13 for CI
+
 * Tue Aug 18 2020 chenyaqiang <chenyaqiang@huawei.com> - 2.4.48-9
 - rebuild for package build
 
-- 
Gitee