From 532a7241140b09acc10bdc8c5ff4e120b07e5c73 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 25 May 2023 10:46:17 +0800
Subject: [PATCH] update glib2 error

(cherry picked from commit 8247035327d9f2d5e740f4d338d4ce632bcbed99)
---
 ukui-screensaver.spec | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/ukui-screensaver.spec b/ukui-screensaver.spec
index e0e1090..3a4fc89 100644
--- a/ukui-screensaver.spec
+++ b/ukui-screensaver.spec
@@ -1,18 +1,12 @@
-#glib2-devel >= 2.74.4 glib2test 1
-%global glib2test 0
-
 Name:           ukui-screensaver
 Version:        3.1.1
-Release:        3
+Release:        4
 Summary:        Screensaver for UKUI desktop environment
 License:        GPL-3+ and GPL-2+
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
 Patch01:        0001-fix-root-can-not-input-passwd-bug.patch
-#glib2-devel >= 2.74.4 apply pathch02
-%if %{?glib2test}
 Patch02:        0002-fix-build-compile-error.patch
-%endif
 
 BuildRequires:  cmake
 BuildRequires:  qt5-qtbase-devel
@@ -43,10 +37,10 @@ provided by biometric-auth service.
                                                             
 %prep
 %setup -q
-%patch1 -p1
-%if %{?glib2test}
-%patch2 -p1
-%endif
+%patch01 -p1
+if [ -e "/usr/include/glib-2.0/gio/gunixfdlist.h" ]; then
+%patch02 -p1
+fi
 
 %build
 cmake .
@@ -81,6 +75,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||:
 %{_prefix}/lib/ukui-screensaver/screensaver-focus-helper
 
 %changelog
+* Thu May 25 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-4
+- update glib2 error
+
 * Fri Feb 10 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.1-3
 - fix build compile error