!18 update to version 1.0.3

From: @dou33 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2023-05-23 07:41:41 +00:00 committed by Gitee
commit 6022b31884
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 61 additions and 7 deletions

View File

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

Binary file not shown.

BIN
ukui-interface-1.0.3.tar.gz Normal file

Binary file not shown.

View File

@ -1,13 +1,13 @@
%define debug_package %{nil}
Name: ukui-interface
Version: 1.0.2
Release: 5
Version: 1.0.3
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
@ -19,14 +19,17 @@ ukui interface provides the interface for system configuration and related libra
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
./autogen.sh
./configure --prefix=/usr --libdir=/usr/lib64
%{make_build}
cd %{_builddir}/%{name}-%{version}/src/log4qt
qmake-qt5
make
%{qmake_qt5}
%{make_build}
%install
%{make_install} INSTALL_ROOT=%{buildroot}
@ -60,6 +63,15 @@ 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
* 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
@ -69,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Feb 25 2022 douyan <douyan@kylinos.cn> - 1.0.2-3
- add ukui-log4qt package
* Wed Feb 24 2022 douyan<douyan@kylinos.cn> - 1.0.2-2
* 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

4
ukui-interface.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: https://github.com/ukui/ukui-interface.git
tag_prefix: "v"
separator: "."