From dc6db3b24420b53cbb55b7ccc00578c74346fe8f Mon Sep 17 00:00:00 2001 From: chengguipeng Date: Wed, 17 Mar 2021 20:11:39 +0800 Subject: [PATCH 1/2] augeas: fix test-localeconv failed on arm Signed-off-by: chengguipeng (cherry picked from commit b011010c5fb4031a39badd9c87f495cbf0c1442d) --- augeas.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/augeas.spec b/augeas.spec index 05cd2fd..10b77b6 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.12.0 -Release: 6 +Release: 5 Summary: Augeas is a configuration editing tool for changing configuration files License: LGPLv2+ URL: https://augeas.net/ @@ -46,6 +46,9 @@ Provide header files and libraries for the use of building a extension library f %check export SKIP_TEST_PRESERVE_SELINUX=1 +%ifarch aarch64 +sed -i 's/^CFLAGS/s/$/ -fsigned-char/g' ./gnulib/tests/Makefile +%endif make check %install @@ -80,17 +83,11 @@ make check %doc %{_mandir}/man1/au*.1.gz %changelog -* Tue Sep 16 2020 chengguipeng - 1.12.0-6 +* Wed Mar 17 2021 chengguipeng - 1.12.0-5 - Type:bugfix - ID:NA - SUG:NA -- DESC:modify source0 url. - -* Tue Sep 8 2020 chengguipeng - 1.12.0-5 -- Type:bugfix -- ID:NA -- SUG:NA -- DESC:avoid NULL pointer dereference in function re_case_expand +- DESC:fix the test-localeconv failed on aarch * Wed Dec 25 2019 openEuler Buildteam - 1.12.0-4 - Type:bugfix -- Gitee From 098a065341fa0f835061744ce5178b4914ed9c85 Mon Sep 17 00:00:00 2001 From: chengguipeng_xian Date: Thu, 18 Mar 2021 14:53:58 +0800 Subject: [PATCH 2/2] sync the difference --- augeas.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/augeas.spec b/augeas.spec index 10b77b6..249b198 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.12.0 -Release: 5 +Release: 7 Summary: Augeas is a configuration editing tool for changing configuration files License: LGPLv2+ URL: https://augeas.net/ @@ -83,12 +83,24 @@ make check %doc %{_mandir}/man1/au*.1.gz %changelog -* Wed Mar 17 2021 chengguipeng - 1.12.0-5 +* Tue Mar 18 2021 chengguipeng - 1.12.0-7 - Type:bugfix - ID:NA - SUG:NA - DESC:fix the test-localeconv failed on aarch +* Tue Sep 16 2020 chengguipeng - 1.12.0-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:modify source0 url. + +* Tue Sep 8 2020 chengguipeng - 1.12.0-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:avoid NULL pointer dereference in function re_case_expand + * Wed Dec 25 2019 openEuler Buildteam - 1.12.0-4 - Type:bugfix - ID:NA -- Gitee