!22 Fix when %kylin is 3_*, Unable to run rpmbuild - bs

From: @kylin-huangjiawen 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02

0001-fix-pc-Fix-the-Libs-field-error-in-pc-file.patch

@@ -0,0 +1,41 @@
+From 66fd16f11a083c63a92127603d2c3cd40f74fea4 Mon Sep 17 00:00:00 2001
+From: tangjie02 <tangjie02@kylinsec.com.cn>
+Date: Fri, 28 Oct 2022 14:27:29 +0800
+Subject: [PATCH] fix(pc): Fix the Libs field error in pc file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 修复pc文件中Libs字段中-L编译选项填写错误
+
+Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
+---
+ data/klog-gtk3.pc.in | 2 +-
+ data/klog-qt5.pc.in  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/klog-gtk3.pc.in b/data/klog-gtk3.pc.in
+index 33c7582..ce034ff 100644
+--- a/data/klog-gtk3.pc.in
++++ b/data/klog-gtk3.pc.in
+@@ -2,5 +2,5 @@ Name: kiran-log-gtk3
+ Description: kiran log library for gtk3
+ Version: @PROJECT_VERSION@
+ Requires: glibmm-2.4
+-Libs: -L$@KLOG_LIBDIR@  -lklog-gtk3 -lpthread
++Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@  -lklog-gtk3 -lpthread
+ Cflags: -I@KLOG_INCLUDEDIR@
+diff --git a/data/klog-qt5.pc.in b/data/klog-qt5.pc.in
+index e1226a2..3cd4620 100644
+--- a/data/klog-qt5.pc.in
++++ b/data/klog-qt5.pc.in
+@@ -2,5 +2,5 @@ Name: kiran-log-qt5
+ Description: kiran log library for qt5
+ Version: @PROJECT_VERSION@
+ Requires:  Qt5Core
+-Libs: -L$@KLOG_LIBDIR@  -lklog-qt5 -lpthread
++Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@  -lklog-qt5 -lpthread
+ Cflags: -I@KLOG_INCLUDEDIR@
+-- 
+2.33.0
+

0002-fix-default-log-level-Change-the-default-kylinsec-se.patch

@@ -0,0 +1,30 @@
+From 3ab6d385584bea93931818a4eb6e7a16f028a67b Mon Sep 17 00:00:00 2001
+From: liuxinhao <liuxinhao@kylinsec.com.cn>
+Date: Fri, 9 Dec 2022 14:27:19 +0800
+Subject: [PATCH 2/2] fix(default log level): Change the default
+ kylinsec-session log level to INFO
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 修改kylinsec-session默认日志级别为INFO
+---
+ data/zlog.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/zlog.conf b/data/zlog.conf
+index e8985ae..1e66dba 100644
+--- a/data/zlog.conf
++++ b/data/zlog.conf
+@@ -67,7 +67,7 @@ kylinsec-session-app.INFO	"%E(HOME)/.cache/kylinsec/%E(PROJECT_NAME)/%E(PROGRAM_
+ kylinsec-system-app.INFO	"/var/log/kylinsec/%E(PROJECT_NAME)/%E(PROGRAM_NAME).log",\
+                                 1MB * 10 ~ "/var/log/kylinsec/%E(PROJECT_NAME)/%E(PROGRAM_NAME).log.#r";
+ 
+-kylinsec-session.DEBUG		"%E(HOME)/.cache/kylinsec/%E(PROJECT_NAME)/%E(PROGRAM_NAME).log",\
++kylinsec-session.INFO		"%E(HOME)/.cache/kylinsec/%E(PROJECT_NAME)/%E(PROGRAM_NAME).log",\
+                                 1MB * 10 ~ "%E(HOME)/.cache/kylinsec/%E(PROJECT_NAME)/%E(PROGRAM_NAME).log.#r";
+ 
+ kylinsec-system.INFO		"/var/log/kylinsec/%E(PROJECT_NAME)/%E(PROGRAM_NAME).log",\
+-- 
+2.33.0
+

kiran-log.spec

@@ -1,23 +1,21 @@
 %global ky3_2 0
 
 Name:		kiran-log
-Version:	2.2.2
+Version:	2.4.0
-Release:  	1.kb1
+Release:	3
 Summary:	kiran log out library
 Summary(zh_CN): kiran桌面日志输出库
 
-License: 	Mulan PSL v2
+License: 	MulanPSL-2.0
 #URL:
 Source0:	%{name}-%{version}.tar.gz
 
+Patch1000:  0001-fix-pc-Fix-the-Libs-field-error-in-pc-file.patch
+Patch1001:	0002-fix-default-log-level-Change-the-default-kylinsec-se.patch	
+
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
-
-%if 0%{?kylin}
-BuildRequires:  zlog-devel
-%else
 BuildRequires:  zlog
-%endif
 
 
 %description
@@ -29,6 +27,7 @@ Summary(zh_CN): kiran桌面Qt5日志输出库
 BuildRequires:  qt5-qtbase-devel
 Requires:  qt5-qtbase
 Requires:  zlog
+Requires:  %{name}
 %description qt5
 %{summary}.
 
@@ -45,6 +44,7 @@ Summary(zh_CN): kiran桌面gtk3日志输出库
 BuildRequires: pkgconfig(glibmm-2.4)
 Requires:  glibmm24
 Requires:  zlog
+Requires:  %{name}
 %description gtk3
 %{summary}.
 
@@ -60,7 +60,7 @@ Requires:	%{name}-gtk3%{?_isa} = %{version}-%{release}
 
 %build
 %{__mkdir} -p %{buildroot}
-%if 0%{?kylin}
+%if "%{kylin}" != ""
   %if 0%{ky3_2} == 1
     %cmake -DCMAKE_INSTALL_LIBDIR=lib64
   %else
@@ -75,6 +75,9 @@ make %{?_smp_mflags}
 %install
 %make_install
 
+%files
+%{_sysconfdir}/kiran-log/zlog.conf
+
 %files qt5
 %{_libdir}/libklog-qt5.so.2*
 
@@ -95,55 +98,11 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 
 %changelog
-* Sat Feb 19 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.1-2.kb1
+* Fri Dec 09 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.4.0-3
-- KYOS-B: Fix compile error on openeuler.
+- KYOS-F: Change the default kylinsec-session log level to INFO
 
-* Fri Feb 18 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.1-1.kb1
+* Fri Oct 28 2022 tangjie02 <tangjie02@kylnsec.com.cn> - 2.4.0-2
-- KYOS-F: Compatible to KY3.2 os version.
+- KYOS-B: Fix the Libs field error in pc file
 
-* Wed Jan 19 2022 longcheng <longcheng@kylinos.com.cn> - 2.1.1-5.kb1
+* Mon Sep 26 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.4.0-1
-- update to 2.1.1-5
+- KYOS-F: Add zlog.conf file and dzlog_init_ex function to this project.
-
-* Tue Jan 04 2022 caoyuanji <caoyuanji@kylinos.com.cn> - 2.1.1-3.kb1
-- Add compilation dependency cmake
-
-* Wed Dec 29 2021 kpkg <kpkg@kylinos.com.cn> - 2.1.1-2.kb1
-- rebuild for KY3.4-MATE-modules-dev
-
-* Wed Dec 29 2021 caoyuanji<caoyuanji@kylinos.com.cn> - 2.1.1-2
-- Upgrade version number for easy upgrade
-
-* Mon Dec 20 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 2.1.1-1.kb2
-- rebuild for KY3.4-4-KiranUI-2.2
-
-* Mon Dec 20 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 2.1.1-1.kb1
-- rebuild for KY3.4-4-KiranUI-2.2
-
-* Tue Aug 03 2021 tangjie02 <tangjie02@kylinos.com.cn> - 2.1.1-1.ky3
-- KYOS-F: Modify the license to Mulan PSL v2.
-
-* Mon Jul 05 2021 tangjie02 <tangjie02@kylinos.com.cn> - 2.1.0-1.ky3
-- KYOS-F: Add LICENSE and compatible upstream zlog version.
-
-* Fri Jun 04 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 1.0.4-2.ky3
-- KYOS-B: delete useless log output macro definition.
-
-* Fri Jun 04 2021 tangjie02 <tangjie02@kylinos.com.cn> - 1.0.4-1.ky3
-- KYOS-B: Fix the name error that rename glibmm-2.4 to glibmm24.
-
-* Mon May 24 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 1.0.3
-- KYOS-F: add log library for gtk3
-- KYOS-F: all QT5 log output is turned on by default and filtered by zlog
-
-* Fri May 21 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 1.0.2
-- KYOS-B: fix the problem of not adding parameters to the project name during log initialization
-- KYOS-B: fix incorrect macro usage in development header file   
-
-* Thu May 13 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 1.0.1
-- KYOS-B: add the dependent zlog and QT related header files into the development header file
-
-* Sat May 08 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 1.0.0-1
-- KYOS-B: fix log library initialization detection failed,zlog configuration file name error 
-
-* Fri Apr 30 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 1.0.0
-- Initial build

kiran-log.yaml

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