From 65267e7b43068f5161d79864264ae5b958b63d7c Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinsec.com.cn>
Date: Fri, 11 Aug 2023 10:18:28 +0800
Subject: [PATCH] fix(gsettings): screensaver-locker paths use the cmake macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改screensaver-locker的插件路径为使用cmake宏
---
 ...reensaver-locker-paths-use-the-cmake.patch | 50 +++++++++++++++++++
 kiran-screensaver.spec                        |  6 ++-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 0001-fix-gsettings-screensaver-locker-paths-use-the-cmake.patch

diff --git a/0001-fix-gsettings-screensaver-locker-paths-use-the-cmake.patch b/0001-fix-gsettings-screensaver-locker-paths-use-the-cmake.patch
new file mode 100644
index 0000000..3e9fd44
--- /dev/null
+++ b/0001-fix-gsettings-screensaver-locker-paths-use-the-cmake.patch
@@ -0,0 +1,50 @@
+From e49c123a61604ec14a38bde27995585c6ae6e673 Mon Sep 17 00:00:00 2001
+From: liuxinhao <liuxinhao@kylinsec.com.cn>
+Date: Fri, 11 Aug 2023 09:56:14 +0800
+Subject: [PATCH] fix(gsettings): screensaver-locker paths use the cmake macro
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 修改screensaver-locker的插件路径为使用cmake宏
+
+Closes #12303
+---
+ CMakeLists.txt                                               | 5 ++++-
+ ...ema.xml => com.kylinsec.kiran.screensaver.gschema.xml.in} | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+ rename data/{com.kylinsec.kiran.screensaver.gschema.xml => com.kylinsec.kiran.screensaver.gschema.xml.in} (90%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb60b39..aeab1e4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,4 +120,7 @@ install(FILES ${DEVEL_HEADER} DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTAL
+ #install(FILES ${CMAKE_BINARY_DIR}/com.kylinsec.Kiran.ScreenSaver.service DESTINATION ${DBUS_SERVICE_INSTALL_DIR})
+ install(FILES data/kiran-screensaver.desktop DESTINATION ${XDG_AUTO_START_DIR})
+ install(FILES data/kiran-screensaver DESTINATION /${CMAKE_INSTALL_SYSCONFDIR}/pam.d/)
+-install(FILES data/com.kylinsec.kiran.screensaver.gschema.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas/)
++
++set(SCREENSAVER_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/kiran-screensaver)
++configure_file(data/com.kylinsec.kiran.screensaver.gschema.xml.in ${CMAKE_BINARY_DIR}/com.kylinsec.kiran.screensaver.gschema.xml )
++install(FILES ${CMAKE_BINARY_DIR}/com.kylinsec.kiran.screensaver.gschema.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas/)
+\ No newline at end of file
+diff --git a/data/com.kylinsec.kiran.screensaver.gschema.xml b/data/com.kylinsec.kiran.screensaver.gschema.xml.in
+similarity index 90%
+rename from data/com.kylinsec.kiran.screensaver.gschema.xml
+rename to data/com.kylinsec.kiran.screensaver.gschema.xml.in
+index 17b6f20..d364f17 100644
+--- a/data/com.kylinsec.kiran.screensaver.gschema.xml
++++ b/data/com.kylinsec.kiran.screensaver.gschema.xml.in
+@@ -2,7 +2,7 @@
+ <schemalist>
+     <schema id="com.kylinsec.kiran.screensaver" path="/com/kylinsec/kiran/screensaver/">
+         <key name="screensaver-locker" type="s">
+-            <default>"/usr/lib64/kiran-screensaver/libkiran-screensaver-dialog.so"</default>
++            <default>"@SCREENSAVER_PLUGIN_DIR@/libkiran-screensaver-dialog.so"</default>
+         </key>
+ 
+         <key name="idle-activation-lock" type="b">
+-- 
+2.33.0
+
diff --git a/kiran-screensaver.spec b/kiran-screensaver.spec
index 1a6f820..9659625 100644
--- a/kiran-screensaver.spec
+++ b/kiran-screensaver.spec
@@ -1,12 +1,13 @@
 Name:    kiran-screensaver
 Version: 2.2.3
-Release: 1
+Release: 2
 Summary: Kiran Desktop Screensaver Backend
 Summary(zh_CN): kiran桌面屏保后端
 
 License: MulanPSL-2.0
 
 Source0: %{name}-%{version}.tar.gz
+Patch0001: 0001-fix-gsettings-screensaver-locker-paths-use-the-cmake.patch
 
 BuildRequires: gcc-c++
 BuildRequires: cmake
@@ -70,6 +71,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
 rm -rf %{buildroot}
 
 %changelog
+* Fri Aug 11 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.2.3-2
+- KYOS-B: gsettings screensaver-locker paths use the cmake macro (#12303)
+
 * Sun Jun 25 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.2.3-1
 - KYOS-B: where typing could not be done due to keyboard grab conflicts(#I7C0TD)