From 38700c8f02d63a22a5ec9e204dcecdfc35a94ad1 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Mon, 27 Mar 2023 13:32:13 +0800
Subject: [PATCH] Fix the error caused by the non-existence of the lsb-release

(cherry picked from commit ff73f4fc7db4f793b353a3001cbb9943d906a189)
---
 ...the-non-existence-of-the-lsb-release.patch | 38 +++++++++++++++++++
 ukui-interface.spec                           |  9 ++++-
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 0001-Fix-the-error-caused-by-the-non-existence-of-the-lsb-release.patch

diff --git a/0001-Fix-the-error-caused-by-the-non-existence-of-the-lsb-release.patch b/0001-Fix-the-error-caused-by-the-non-existence-of-the-lsb-release.patch
new file mode 100644
index 0000000..eff8ae6
--- /dev/null
+++ b/0001-Fix-the-error-caused-by-the-non-existence-of-the-lsb-release.patch
@@ -0,0 +1,38 @@
+From 659f8fcfb42167a9d1464f3c7f84c6b666c23b3f Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Mon, 27 Mar 2023 13:20:49 +0800
+Subject: [PATCH] Fix the error caused by the non-existence of the lsb-release
+
+---
+ src/common/kylin-com4c.c     | 3 +++
+ src/common/kylin-com4cxx.cpp | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/common/kylin-com4c.c b/src/common/kylin-com4c.c
+index ef744c2..bc8e98f 100644
+--- a/src/common/kylin-com4c.c
++++ b/src/common/kylin-com4c.c
+@@ -143,6 +143,9 @@ char* kdk_get_xdgsessiontype()
+ int kdk_get_lsbrelease(const char *key, char *value, int value_max_len)
+ {
+ 	int nRet = -1;
++//在openEuler中/etc/lsb-release文件不存在，直接返回
++        return nRet;
++
+ 	if (NULL == key || NULL == value || 0 >= value_max_len)
+ 		return nRet;
+ 	dictionary *iniHandle = iniparser_load(LSB_RELEASE_FILE);
+diff --git a/src/common/kylin-com4cxx.cpp b/src/common/kylin-com4cxx.cpp
+index 6cbe950..d95e393 100644
+--- a/src/common/kylin-com4cxx.cpp
++++ b/src/common/kylin-com4cxx.cpp
+@@ -147,6 +147,9 @@ string KDKGetXdgSessionType()
+ 
+ string KDKGetLSBRelease(const string key)
+ {
++//在openEuler中/etc/lsb-release文件不存在，直接返回
++       return "";
++
+ 	if (key.empty()) {
+ 		return "";
+ 	}
diff --git a/ukui-interface.spec b/ukui-interface.spec
index dd83772..7d650b8 100644
--- a/ukui-interface.spec
+++ b/ukui-interface.spec
@@ -1,12 +1,13 @@
 Name:           ukui-interface
 Version:        1.0.3
-Release:        2
+Release:        3
 Summary:        UKUI interface provides the interface for system configuration and related libraries.
 License:        GPL-3+ and Apache-2.0
 URL:            https://github.com/ukui/ukui-interface
 Source0:        %{name}-%{version}.tar.gz
 
-patch0: fix_log4qt_lib_path.patch
+Patch0:         fix_log4qt_lib_path.patch
+Patch1:         0001-Fix-the-error-caused-by-the-non-existence-of-the-lsb-release.patch
 
 BuildRequires: glib2-devel autoconf automake libtool qt5-qtbase-devel gsettings-qt-devel qt5-qttools-devel iniparser
 
@@ -18,6 +19,7 @@ ukui interface provides the interface for system configuration and related libra
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 ./autogen.sh
@@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 27 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.3-3
+- Fix the error caused by the non-existence of the lsb-release
+
 * Wed Jan 18 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.3-2
 - add build debuginfo and debugsource