!19 Improve the project according to the requirements of compliance improvement

From: @tanyulong2021 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

ukui-power-manager.spec

@@ -1,9 +1,9 @@
 %define debug_package %{nil}
 Name:           ukui-power-manager
 Version:        2.0.3
-Release:        7
+Release:        8
 Summary:        power management tool for the UKUI desktop
-License:        GPL-2+ LGPL-2+ GFDL-1.1+
+License:        GPL-2.0-or-later and LGPL-2.0-or-later
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
 
@@ -434,13 +434,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< HEAD
+* Fri May 20 2022 tanyulong<tanyulong@kylinos.cn> - 2.0.3-8
+- Improve the project according to the requirements of compliance improvement
+
 * Wed Apr 06 2022 huayadong <huayadong@kylinos.cn> - 2.0.3-7
 - some project changes
-=======
-* Sat Apr 02 2022 tanyulong <tanyulong@kylinos.cn> - 2.0.3-7
-- add yaml file
->>>>>>> d1cb8dd97fb1d7abb9a29e2493304d614ec786a1
 
 * Tue Nov 09 2021 tanyulong <tanyulong@kylinos.cn> - 2.0.3-6
 - add man files