From b28b9d2d2a858058e7defd78669d21564001173a Mon Sep 17 00:00:00 2001
From: zhangxianting <zhangxianting@uniontech.com>
Date: Thu, 15 Aug 2024 15:47:05 +0800
Subject: [PATCH] fix build error, check aclocal version

(cherry picked from commit e1532ff614ca98b88d5cdf72576f7f87378c7ffb)
---
 atril.spec                                  |  6 ++++-
 fix-build-error-check-aclocal-version.patch | 27 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 fix-build-error-check-aclocal-version.patch

diff --git a/atril.spec b/atril.spec
index 255effd..7aef005 100644
--- a/atril.spec
+++ b/atril.spec
@@ -14,7 +14,7 @@
 
 Name:          atril
 Version:       %{branch}.3
-Release:       4
+Release:       5
 Summary:       Document viewer
 License:       GPLv2+ and LGPLv2+ and MIT
 URL:           http://mate-desktop.org
@@ -27,6 +27,7 @@ URL:           http://mate-desktop.org
 Patch01:        CVE-2023-52076.patch
 #fix from https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Fmate-desktop%2Fatril%2Fcommit%2Fce41df6467521ff9fd4f16514ae7d6ebb62eb1ed
 Patch02:        CVE-2023-51698.patch
+Patch03:        fix-build-error-check-aclocal-version.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  gtk3-devel
@@ -167,6 +168,9 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/atril.desktop
 
 
 %changelog
+* Thu Aug 15 2024 zhangxianting <zhangxianting@uniontech.com> - 1.22.3-5
+- fix build error, check aclocal version
+
 * Wed Apr 24 2024 peijiankang <peijiankang@kylinos.cn> - 1.22.3-4
 - add CVE-2023-51698.patch
 
diff --git a/fix-build-error-check-aclocal-version.patch b/fix-build-error-check-aclocal-version.patch
new file mode 100644
index 0000000..3b34497
--- /dev/null
+++ b/fix-build-error-check-aclocal-version.patch
@@ -0,0 +1,27 @@
+From 3554f6eacb571c875f46b44f87715ac8a5ae6215 Mon Sep 17 00:00:00 2001
+From: zhangxianting <zhangxianting@uniontech.com>
+Date: Thu, 15 Aug 2024 15:38:07 +0800
+Subject: [PATCH] fix build error check aclocal version
+
+---
+ configure | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure b/configure
+index e3ad2d3..c56b580 100755
+--- a/configure
++++ b/configure
+@@ -3045,6 +3045,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ am__api_version='1.16'
++# Check aclocal version
++if test "$ACLOCAL" != "no"; then
++  am__api_version=$(aclocal --version | head -n1 | awk '{print $NF}')
++fi
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+-- 
+2.43.0
+
-- 
Gitee