merge master branch

0002-Repair-the-user-guide-does-not-work.patch

@@ -0,0 +1,25 @@
+From 22611af8c0394ef4b1b057c5d683c30c16ae5777 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Fri, 3 Mar 2023 15:56:13 +0800
+Subject: [PATCH] Repair the user guide does not work
+
+---
+ src/model/logicmain.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/model/logicmain.cpp b/src/model/logicmain.cpp
+index 16a6f5a..7931ae2 100644
+--- a/src/model/logicmain.cpp
++++ b/src/model/logicmain.cpp
+@@ -50,7 +50,7 @@ LogicMain::LogicMain(QObject *parent) :
+     pwd = getpwuid(getuid());
+ 
+     msg = QDBusMessage::createMethodCall( QString("com.kylinUserGuide.hotel_%1")
+-                                          .arg(pwd->pw_gid),"/", "com.guide.hotel",
++                                          .arg(pwd->pw_uid),"/", "com.guide.hotel",
+                                           "showGuide");
+     f.setFile("/usr/share/kylin-user-guide/data/guide/kylin-burner");
+     msg << "kylin-burner";
+-- 
+2.33.0
+

0003-fix-version-of-kylin-burner.patch

@@ -0,0 +1,25 @@
+From b1e6775378c19aaa6272cf739b57a2ea9ad88d11 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Wed, 22 Mar 2023 13:55:00 +0800
+Subject: [PATCH] fix version of kylin-burner
+
+---
+ src/view/kybaboutdialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/view/kybaboutdialog.cpp b/src/view/kybaboutdialog.cpp
+index a2077a3..e319bf7 100644
+--- a/src/view/kybaboutdialog.cpp
++++ b/src/view/kybaboutdialog.cpp
+@@ -13,7 +13,7 @@
+ KYBAboutDialog *KYBAboutDialog::m_oInstance = nullptr;
+ QMutex          KYBAboutDialog::m_oMutex;
+ 
+-#define VERSION "3.2.0"
++#define VERSION "3.10.3"
+ 
+ #include <QDebug>
+ 
+-- 
+2.39.1
+

kylin-burner.spec

@@ -1,12 +1,13 @@
-%define debug_package %{nil}
 Name:          kylin-burner
-Version:       3.10.2
+Version:       3.10.3
-Release:       3
+Release:       1
 Summary:       CD/DVD burning application for UKUI.
 License:       GPL-3.0-or-later
 URL:           https://github.com/UbuntuKylin/kylin-burner
 Source0:       %{name}-%{version}.tar.gz
 Patch01:       0001-Fix-the-problem-of-scrambled-burner.patch
+Patch02:       0002-Repair-the-user-guide-does-not-work.patch
+Patch03:       0003-fix-version-of-kylin-burner.patch
 
 BuildRequires: cmake
 BuildRequires: qt5-qtx11extras-devel
@@ -29,12 +30,14 @@ CD/DVD burning application for UKUI.
 %prep
 %setup -q
 %patch01 -p1
+%patch02 -p1
+%patch03 -p1
 
 %build
 mkdir cmake-build
 pushd cmake-build
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+%cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-make
+%{make_build}
 popd 
 
 %install
@@ -49,6 +52,18 @@ popd
 %{_datadir}/locale/zh_CN/LC_MESSAGES/kylin-burner.mo
 
 %changelog
+* Mon May 08 2023 peijiankang <peijiankang@kylinos.cn> - 3.10.3-1
+- update upstream version to 3.10.3
+
+* Wed Mar 22 2023 peijiankang <peijiankang@kylinos.cn> - 3.10.2-6
+- fix version of kylin-burner
+
+* Fri Mar 03 2023 peijiankang <peijiankang@kylinos.cn> - 3.10.2-5
+- Repair the user guide does not work
+
+* Fri Aug 19 2022 peijiankang <peijiankang@kylinos.cn> - 3.10.2-4
+- add build debuginfo and debugsource
+
 * Fri Aug 19 2022 peijiankang <peijiankang@kylinos.cn> - 3.10.2-3
 - Fix the problem of scrambled burner