!17 [sync] PR-16: Fix the error caused by the non-existence of the lsb-release

From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

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 "";
+ 	}

fix_log4qt_lib_path.patch

@@ -0,0 +1,12 @@
+diff -Naur ukui-interface-1.0.2/src/log4qt/ukui-log4qt.pro ukui-interface-1.0.2~/src/log4qt/ukui-log4qt.pro
+--- ukui-interface-1.0.2/src/log4qt/ukui-log4qt.pro	2021-11-04 16:31:37.000000000 +0800
++++ ukui-interface-1.0.2~/src/log4qt/ukui-log4qt.pro	2022-02-25 12:37:20.906722506 +0800
+@@ -35,7 +35,7 @@
+ 
+ # Default rules for deployment.
+ unix {
+-    target.path = /usr/lib
++    target.path = /usr/lib64
+ }
+ !isEmpty(target.path): INSTALLS += target
+ 

ukui-interface.spec

@@ -1,34 +1,47 @@
-%define debug_package %{nil}
 Name:           ukui-interface
-Version:        1.0.2
+Version:        1.0.3
-Release:        2
+Release:        3
 Summary:        UKUI interface provides the interface for system configuration and related libraries.
-License:        GPL-3+ Apache-2.0
+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
+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
 
+Provides: libukui-log4qt libukui-log4qt-devel
+
 %description
 ukui interface provides the interface for system configuration and related libraries.
 
 %prep
 %setup -q
-
+%patch0 -p1
-./autogen.sh
+%patch1 -p1
 
 %build
+./autogen.sh
+./configure --prefix=/usr --libdir=/usr/lib64
+
+%{make_build}
+cd %{_builddir}/%{name}-%{version}/src/log4qt
+%{qmake_qt5}
 %{make_build}
 
 %install
 %{make_install}  INSTALL_ROOT=%{buildroot}
 mkdir -p %{buildroot}/usr/include/ukuisdk
 mv %{buildroot}/usr/include/*.h %{buildroot}/usr/include/ukuisdk
+cd %{_builddir}/%{name}-%{version}/src/log4qt
+make INSTALL_ROOT=%{buildroot} install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%doc debian/copyright debian/changelog
 %{_bindir}/ukui-backgroundserver
 %{_bindir}/ukui-desktopserver
 %{_bindir}/ukui-fontserver
@@ -44,9 +57,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/ukuisdk/kylin-*.h
 %{_libdir}/libukui*
 %{_datadir}/dbus-1/services/*.service
+%{_includedir}/ukui-log4qt.h
+%{_datadir}/glib-2.0/schemas/org.ukui.log4qt.gschema.xml
+
 
 %changelog
-* Wed Feb 24 2021 douyan<douyan@kylinos.cn> - 1.0.2-2
+* 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
+
+* Wed Nov 9 2022 douyan <douyan@kylinos.cn> - 1.0.3-1
+- update to upstream version 1.0.3-1
+
+* Sun May 29 2022 lijian <lijian2@kylinos.cn> - 1.0.2-5
+- License compliance rectification
+
+* Wed Mar 2 2022 douyan <douyan@kylinos.cn> - 1.0.2-4
+- fix conflict lib file
+
+* Fri Feb 25 2022 douyan <douyan@kylinos.cn> - 1.0.2-3
+- add ukui-log4qt package
+
+* Thu Feb 24 2022 douyan<douyan@kylinos.cn> - 1.0.2-2
 - change head file location
 
 * Thu Feb 17 2022 pei-jiankang <peijiankang@kylinos.cn> - 1.0.2-1