!2 Update to 2.1 version

From: @tangjie02
Reviewed-by: @doudou19
Signed-off-by: @doudou19

0001-fix-Specify-the-library-file-search-path.patch

@@ -1,43 +0,0 @@
-From ab8006d8c2688593ff094829f0b2092c05356c35 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 12 May 2021 17:57:55 +0800
-Subject: [PATCH] fix:Specify the library file search path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- 指定库文件搜索路径
----
- src/meson.build | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/meson.build b/src/meson.build
-index 08f9e3c..f3a8096 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -31,6 +31,7 @@ executable('kiran-calendar-test',
-   'common.c',
-   install : false,
-   c_args: '-g',
-+  link_args : '-Wl,-rpath=/usr/lib64',
-   dependencies : [glib_dep, gobject_dep, gtk_dep, lundate_dep]
- )
- 
-@@ -42,6 +43,7 @@ executable('kiran-clock-test',
-   'common.c',
-   install : false,
-   c_args: '-g',
-+  link_args : '-Wl,-rpath=/usr/lib64',
-   dependencies : [glib_dep, gobject_dep, gtk_dep, lundate_dep]
- )
- 
-@@ -53,5 +55,6 @@ executable('kiran-clock-applet',
-   'common.c',
-   install : true,
-   install_dir: libexecdir,
-+  link_args : '-Wl,-rpath=/usr/lib64',
-   dependencies : [glib_dep, gobject_dep, gtk_dep, lundate_dep, libmatepanelapplet_dep]
- )
--- 
-2.18.1
-

kiran-calendar.spec

@@ -1,16 +1,15 @@
 Name: kiran-calendar
 Summary: Kiran Desktop Calendar
-Version: 1.0.0
+Version: 2.1.0
 
 %define _libver 3_0
 
-Release: 1.0%{?dist}
-License: GPL-2.0+
+Release: 3%{?dist}
+License: GPLv3
 Group: System/I18n/Chinese
 Url: http://liblunar.googlecode.com/
 Source: https://liblunar.googlecode.com/files/%{name}-%{version}.tar.gz
 
-Patch0001:	0001-fix-Specify-the-library-file-search-path.patch
 
 BuildRequires: gobject-introspection-devel intltool
 
@@ -19,11 +18,13 @@ BuildRequires: git
 BuildRequires: lunar-date-devel
 BuildRequires: gtk3-devel
 BuildRequires: mate-panel-devel
-BuildRequires: lunar-date
+BuildRequires: kiran-panel-devel
+BuildRequires: kiran-panel-libs
 
 Requires: lunar-date
 Requires: gtk3
 Requires: mate-panel
+Requires: kiran-system-daemon
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
 
@@ -31,13 +32,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
 Kiran Desktop Calendar Which Provides Chinese Lunar calendar
 
 %prep
-#%autosetup -S git
-%autosetup -p1
+%autosetup -S git
 
 %build
-export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH
-%meson
-%meson_build
+%meson -Dkiran_desktop=true
+%meson_build 
 
 
 %install
@@ -54,12 +53,60 @@ export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH
 %files
 %defattr(-,root,root,-)
 %{_libexecdir}/kiran-clock-applet
-%{_datadir}/dbus-1/services/org.mate.panel.applet.KiranClockAppletFactory.service
+%{_datadir}/dbus-1/services/org.kiran.panel.applet.KiranClockAppletFactory.service
 %{_datadir}/kiran-calendar
 %{_datadir}/locale/zh_CN/LC_MESSAGES/kiran-calendar.mo
-%{_datadir}/mate-panel/applets/org.mate.panel.KiranClockApplet.mate-panel-applet
+%{_datadir}/kiran-panel/applets/org.mate.panel.KiranClockApplet.mate-panel-applet
+%{_datadir}/glib-2.0/schemas/com.kylinsec.kiran.calendar.gschema.xml
 
 
 %changelog
+* Mon Oct 18 2021 xiewenhao <xiewenhao@kylinos.com.cn> 2.1.0-2
+- KYOS-B: fix license information (#43502)
+
+* Sat Oct 09 2021 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 2.1.0-1.kb2
+- KYOS-F: add the GPL code licenses (#35082)
+
+* Tue Sep 14 2021 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 2.1.0-1.kb1
+- KYOS-B: add the default normal color for setting btn (#35082)
+- KYOS-B: close the calendar window when click other place (#35082)
+- KYOS-B: adjust for gb18030 (#35082)
+
+* Wed Aug 25 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.1.0-1
+- KYOS-F: Compatible the kiran-panel.
+
+* Mon Aug 09 2021 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.5-1.kb2
+- KYOS-B: let the clock refresh every second (#35082)
+
+* Wed Jun 16 2021 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.5
+- KYOS-F: rename gsettings name according to specification (#35082)
+- KYOS-F: add the kiran cpanel timedate (#35082)
+
+* Tue May 11 2021 kpkg <kpkg@kylinos.com.cn> - 1.0.4-1.kb1
+- rebuild for KY3.4-4
+
+* Mon Mar 08 2021 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.4
+- KYOS-F: support get the date and time format from dbus (#35082)
+- KYOS-B: change the refresh time when show seconds (#35082)
+
+
+* Fri Feb 26 2021 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.3
+- KYOS-B: add the date and time format settings (#35082)
+
+* Wed Jan 20 2021 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.2
+- KYOS-B: let the clock draw in the center of panel (#34251)
+
+* Fri Nov 20 2020 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.1.kb3
+- KYOS-R: rebuild for 3.4-mate-module-dev, Related #31999
+
+* Wed Nov 18 2020 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.1.kb2
+- KYOS-F: set the clock applet flags to expand minor, Related #31999
+
+* Thu Nov 05 2020 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.1.kb1
+- KYOS-F: add the about dialog, Related #31172
+
+* Fri Oct 09 2020 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.1
+- KYOS-F: add the time setting button, Related #29826
+
 * Tue Aug 04 2020 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 1.0.0
 - KYOS-F: kiran-calendar, version 1.0.0 Related #27425