!5 update to 2.1.1-5

Merge pull request !5 from kylinsecos/master
This commit is contained in:
openeuler-ci-bot 2022-01-20 06:25:33 +00:00 committed by Gitee
commit 868ceb05f5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 9 deletions

Binary file not shown.

View File

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