!4 update to 2.2.1

Merge pull request !4 from kylinsecos/master

kiran-gtk-theme.spec

@@ -1,51 +1,66 @@
-%global     commit_date  20201105
-%global     short_commit 93b21dd
-%global	    git_version  git%{commit_date}.%{short_commit}
-
 Name:		kiran-gtk-theme
-Version:	0.8.1
+Version:	2.2.1
-Release:	7+%{git_version}%{?dist}.kb2
+Release:	3.kb2
 Summary:	GTK+ theme designed for kiran
 
-
-
 License:	LGPLv2+
-URL:            http://www.kylinos.com.cn
+Source0:        %{name}-%{version}.tar.gz
-Source0:        %{name}-%{version}+%{git_version}.tar.gz
+
+BuildRequires:  cmake >= 3.2
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  sassc
+BuildRequires:  python%{python3_pkgversion}
+BuildRequires:  python%{python3_pkgversion}-cairo
 
-Requires:	google-noto-sans-cjk-sc-fonts
 BuildArch:      noarch
 
-Conflicts:      kiran-themes < 0.8.1
-
 %description
-The kiran-gtk-theme package contains the standard theme for the Kiran
+The kiran-gtk-theme package contains the standard theme for the kiran desktop, which provides default appearance for window borders and  GTK+ applications.
-desktop, which provides default appearance for window borders and 
-GTK+ applications.
 
 %prep
 %setup -q
 
-
 %build
-
+%cmake
+make %{?_smp_mflags}
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/share/themes/Kiran
+%make_install
-mkdir -p $RPM_BUILD_ROOT/usr/share/themes/KiranM
-mkdir -p $RPM_BUILD_ROOT/usr/share/themes/KiranM-dark
-cp -r $RPM_BUILD_DIR/%{name}-%{version}/Kiran $RPM_BUILD_ROOT/usr/share/themes
-cp -r $RPM_BUILD_DIR/%{name}-%{version}/KiranM $RPM_BUILD_ROOT/usr/share/themes
-cp -r $RPM_BUILD_DIR/%{name}-%{version}/KiranM-dark $RPM_BUILD_ROOT/usr/share/themes
 
  
 %files
-%doc
 %{_datadir}/themes/Kiran/
-%{_datadir}/themes/KiranM/
+%{_datadir}/themes/Kiran-dark/
-%{_datadir}/themes/KiranM-dark/
 
 %changelog
+* Tue Jan 11 2022 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.1-3.kb2
+- rebuild for KY3.4-5-KiranUI-2.2
+
+* Wed Dec 29 2021 kpkg <kpkg@kylinos.com.cn> - 2.2.1-3.kb1
+- rebuild for KY3.4-MATE-modules-dev
+
+* Wed Dec 29 2021 caoyuanji<caoyuanji@kylinos.com.cn> - 2.2.1-3
+- Upgrade version number for easy upgrade
+
+* Mon Dec 20 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.1-2.kb2
+- rebuild for KY3.4-4-KiranUI-2.2
+
+* Mon Dec 20 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.1-2.kb1
+- rebuild for KY3.4-4-KiranUI-2.2
+
+* Tue Dec 07 2021 wxq <wangxiaoqing@kylinos.com.cn> - 2.2.1-2.ky3
+- KYOS-F: Use the old kiran gtk2 theme.
+
+* Thu Nov 25 2021 wxq <wangxiaoqing@kylinos.com.cn> - 2.2.1.ky3
+- KYOS-F: Add kiran dark and light theme.
+
+* Wed Nov 03 2021 tangjie02 <tangjie02@kylinos.com.cn> - 2.2.0.ky3
+- KYOS-B: New kiran theme.
+
+* Mon May 10 2021 kpkg <kpkg@kylinos.com.cn> - 0.8.1-7+git20201105.93b21dd.kb3
+- rebuild for KY3.4-4
+
 * Thu Nov 05 2020 songchuanfei <songchuanfei@kylinos.com.cn> - 0.8.1-7+git20201105.93b21dd.ky3.kb2
 - KYOS-F: rebuild
 
@@ -59,10 +74,10 @@ cp -r $RPM_BUILD_DIR/%{name}-%{version}/KiranM-dark $RPM_BUILD_ROOT/usr/share/th
 - KYOS-F: fix gnome-software's window manager dose not change with theme.(#29345)
 - KYOS-F: fix kylin-license dialog has not close button.(#29284)  
 
-* Thu Aug 04 2020 zhoujieda <zhoujieda@kylinos.com.cn> - 0.8-1-4.ky3.kb1
+* Tue Aug 04 2020 zhoujieda <zhoujieda@kylinos.com.cn> - 0.8-1-4.ky3.kb1
 - KYOS-F: add old kiran theme and change new theme name
 
-* Mon Jul 28 2020 zhoujieda <zhoujieda@kylinos.com.cn> - 0.8-1-3.ky3.kb2
+* Tue Jul 28 2020 zhoujieda <zhoujieda@kylinos.com.cn> - 0.8-1-3.ky3.kb2
 - KYOS-F: change the window manager layout 
 
 * Thu Jul 23 2020 zhoujieda <zhoujieda@kylinos.com.cn> - 0.8.1-3.ky3.kb1