Merge branch 'master' into openEuler-22.03-LTS-Next

Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>

kiran-log.spec

@@ -1,23 +1,18 @@
 %global ky3_2 0
 
 Name:		kiran-log
-Version:	2.2.2
-Release:  	1.kb1
+Version:	2.4.0
+Release:        1
 Summary:	kiran log out library
 Summary(zh_CN): kiran桌面日志输出库
 
-License: 	Mulan PSL v2
+License: 	MulanPSL-2.0
 #URL:
 Source0:	%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
-
-%if 0%{?kylin}
-BuildRequires:  zlog-devel
-%else
 BuildRequires:  zlog
-%endif
 
 
 %description
@@ -29,6 +24,7 @@ Summary(zh_CN): kiran桌面Qt5日志输出库
 BuildRequires:  qt5-qtbase-devel
 Requires:  qt5-qtbase
 Requires:  zlog
+Requires:  %{name}
 %description qt5
 %{summary}.
 
@@ -45,6 +41,7 @@ Summary(zh_CN): kiran桌面gtk3日志输出库
 BuildRequires: pkgconfig(glibmm-2.4)
 Requires:  glibmm24
 Requires:  zlog
+Requires:  %{name}
 %description gtk3
 %{summary}.
 
@@ -75,6 +72,9 @@ make %{?_smp_mflags}
 %install
 %make_install
 
+%files
+%{_sysconfdir}/kiran-log/zlog.conf
+
 %files qt5
 %{_libdir}/libklog-qt5.so.2*
 
@@ -95,6 +95,12 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 26 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.4.0-1
+- KYOS-F: Add zlog.conf file and dzlog_init_ex function to this project.
+
+* Wed Aug 10 2022 luoqing <luoqing@kylinsec.com.cn> - 2.2.2-3
+- KYOS-F: Modify license.
+
 * Sat Feb 19 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.1-2.kb1
 - KYOS-B: Fix compile error on openeuler.
 

kiran-log.yaml

@@ -0,0 +1,4 @@
+version_control: gitee
+src_repo: https://gitee.com/openeuler/kiran-log.git
+tag_prefix: "v"
+seperator: "."