diff --git a/0001-fix-pc-Fix-the-Libs-field-error-in-pc-file.patch b/0001-fix-pc-Fix-the-Libs-field-error-in-pc-file.patch new file mode 100644 index 0000000..b2424dd --- /dev/null +++ b/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 +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 +--- + 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 + diff --git a/kiran-log-2.2.2.tar.gz b/kiran-log-2.2.2.tar.gz deleted file mode 100644 index 70afa60..0000000 Binary files a/kiran-log-2.2.2.tar.gz and /dev/null differ diff --git a/kiran-log.spec b/kiran-log.spec index bd837d5..cd5057d 100644 --- a/kiran-log.spec +++ b/kiran-log.spec @@ -2,7 +2,7 @@ Name: kiran-log Version: 2.4.0 -Release: 1 +Release: 2 Summary: kiran log out library Summary(zh_CN): kiran桌面日志输出库 @@ -10,6 +10,8 @@ License: MulanPSL-2.0 #URL: Source0: %{name}-%{version}.tar.gz +Patch1000: 0001-fix-pc-Fix-the-Libs-field-error-in-pc-file.patch + BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: zlog @@ -95,61 +97,8 @@ make %{?_smp_mflags} rm -rf %{buildroot} %changelog +* Fri Oct 28 2022 tangjie02 - 2.4.0-2 +- KYOS-B: Fix the Libs field error in pc file + * Mon Sep 26 2022 tangjie02 - 2.4.0-1 - KYOS-F: Add zlog.conf file and dzlog_init_ex function to this project. - -* Wed Aug 10 2022 luoqing - 2.2.2-3 -- KYOS-F: Modify license. - -* Sat Feb 19 2022 tangjie02 - 2.2.1-2.kb1 -- KYOS-B: Fix compile error on openeuler. - -* Fri Feb 18 2022 tangjie02 - 2.2.1-1.kb1 -- KYOS-F: Compatible to KY3.2 os version. - -* Wed Jan 19 2022 longcheng - 2.1.1-5.kb1 -- update to 2.1.1-5 - -* Tue Jan 04 2022 caoyuanji - 2.1.1-3.kb1 -- Add compilation dependency cmake - -* Wed Dec 29 2021 kpkg - 2.1.1-2.kb1 -- rebuild for KY3.4-MATE-modules-dev - -* Wed Dec 29 2021 caoyuanji - 2.1.1-2 -- Upgrade version number for easy upgrade - -* Mon Dec 20 2021 caoyuanji - 2.1.1-1.kb2 -- rebuild for KY3.4-4-KiranUI-2.2 - -* Mon Dec 20 2021 caoyuanji - 2.1.1-1.kb1 -- rebuild for KY3.4-4-KiranUI-2.2 - -* Tue Aug 03 2021 tangjie02 - 2.1.1-1.ky3 -- KYOS-F: Modify the license to Mulan PSL v2. - -* Mon Jul 05 2021 tangjie02 - 2.1.0-1.ky3 -- KYOS-F: Add LICENSE and compatible upstream zlog version. - -* Fri Jun 04 2021 liuxinhao - 1.0.4-2.ky3 -- KYOS-B: delete useless log output macro definition. - -* Fri Jun 04 2021 tangjie02 - 1.0.4-1.ky3 -- KYOS-B: Fix the name error that rename glibmm-2.4 to glibmm24. - -* Mon May 24 2021 liuxinhao - 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 - 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 - 1.0.1 -- KYOS-B: add the dependent zlog and QT related header files into the development header file - -* Sat May 08 2021 liuxinhao - 1.0.0-1 -- KYOS-B: fix log library initialization detection failed,zlog configuration file name error - -* Fri Apr 30 2021 liuxinhao - 1.0.0 -- Initial build