diff --git a/kiran-log-2.1.1.tar.gz b/kiran-log-2.1.1.tar.gz index b4cb076..00a90df 100644 Binary files a/kiran-log-2.1.1.tar.gz and b/kiran-log-2.1.1.tar.gz differ diff --git a/kiran-log.spec b/kiran-log.spec index d5445a0..953eeec 100644 --- a/kiran-log.spec +++ b/kiran-log.spec @@ -1,6 +1,6 @@ Name: kiran-log Version: 2.1.1 -Release: 4%{?dist} +Release: 5.kb1 Summary: kiran log out library Summary(zh_CN): kiran桌面日志输出库 @@ -8,10 +8,18 @@ License: Mulan PSL v2 #URL: Source0: %{name}-%{version}.tar.gz -BuildRequires: cmake >= 3.8 +%define ZLOG_AUTH true + BuildRequires: gcc-c++ -BuildRequires: gtest-devel +BuildRequires: cmake + +%if %{ZLOG_AUTH} == false +BuildRequires: zlog-devel +%else BuildRequires: zlog +%endif + +BuildRequires: gtest-devel %description Kiran log out library @@ -21,6 +29,7 @@ Summary: kiran log out library for qt5 Summary(zh_CN): kiran桌面Qt5日志输出库 BuildRequires: qt5-qtbase-devel Requires: qt5-qtbase +Requires: zlog %description qt5 %{summary}. @@ -36,6 +45,7 @@ Summary: kiran log out library for gtk3 Summary(zh_CN): kiran桌面gtk3日志输出库 BuildRequires: pkgconfig(glibmm-2.4) Requires: glibmm24 +Requires: zlog %description gtk3 %{summary}. @@ -51,7 +61,11 @@ Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} %build %{__mkdir} -p %{buildroot} +%if %{ZLOG_AUTH} == false +%cmake +%else %cmake -DENABLE_ZLOG_EX:BOOL=OFF +%endif make %{?_smp_mflags} %install @@ -77,14 +91,23 @@ make %{?_smp_mflags} rm -rf %{buildroot} %changelog -* Mon Oct 25 2021 tangjie02 - 2.1.1-4.ky3 -- KYOS-F: Move the zlog dependency to Libs field from Requires field. +* Wed Jan 19 2022 longcheng - 2.1.1-5.kb1 +- update to 2.1.1-5 -* Wed Oct 20 2021 tangjie02 - 2.1.1-3 -- KYOS-B: Compatible OpenEuler community. +* Tue Jan 04 2022 caoyuanji - 2.1.1-3.kb1 +- Add compilation dependency cmake -* Mon Oct 18 2021 xiewenhao - 2.1.1-2 -- KYOS-B: rebuild for KiranUI-2.1-OE (#43502) +* 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.