!20 fix version showing "none"

From: @hou-hongxun 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

0001-Fix-the-problem-of-scrambled-burner.patch

@@ -11,7 +11,7 @@ diff --git a/src/main.cpp b/src/main.cpp
 index 29b3615..64570e2 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
-@@ -32,7 +32,9 @@ int main(int argc, char *argv[])
+@@ -55,7 +55,9 @@ int main(int argc, char *argv[])
  
      QApplication a(argc, argv);
  

0001-kylin-burner-fix-version-showing-none-on-about-dialo.patch

@@ -0,0 +1,78 @@
+From c97c831b5cdc5008436733ffcca8946e666c03c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
+Date: Wed, 17 Apr 2024 14:40:24 +0800
+Subject: [PATCH] kylin-burner: fix version showing "none" on about dialog
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
+---
+ src/view/kybaboutdialog.cpp | 38 +++++++++++++------------------------
+ 1 file changed, 13 insertions(+), 25 deletions(-)
+
+diff --git a/src/view/kybaboutdialog.cpp b/src/view/kybaboutdialog.cpp
+index b8c4201..9e20b7e 100644
+--- a/src/view/kybaboutdialog.cpp
++++ b/src/view/kybaboutdialog.cpp
+@@ -31,12 +31,12 @@
+ #include <QStyle>
+ #include <QDesktopServices>
+ #include <QScrollBar>
++#include <QRegularExpression>
++#include <QProcess>
+ 
+ KYBAboutDialog *KYBAboutDialog::m_oInstance = nullptr;
+ QMutex          KYBAboutDialog::m_oMutex;
+ 
+-#define VERSION "3.10.3"
+-
+ #include <QDebug>
+ 
+ KYBAboutDialog::KYBAboutDialog(QWidget *parent) :
+@@ -211,31 +211,19 @@ KYBAboutDialog::~KYBAboutDialog()
+ 
+ QString KYBAboutDialog::getCurrentVersion()
+ {
+-    FILE *pp = NULL;
+-    char *line = NULL;
+-    size_t len = 0;
+-    ssize_t read;
+-    char *q = NULL;
+-    QString version = tr("none");
+-
+-    pp = popen("dpkg -l kylin-burner", "r");
+-    if(NULL == pp)
+-        return version;
++	QProcess v_p;
++	v_p.start("rpm", QStringList() << "-q" << "kylin-burner");
+ 
+-    while((read = getline(&line, &len, pp)) != -1){
+-        q = strrchr(line, '\n');
+-        *q = '\0';
++	if (!v_p.waitForFinished())
++		return "none";
+ 
+-        QString content = line;
+-        QStringList list = content.split(" ");
++	QByteArray ba = v_p.readAllStandardOutput();
+ 
+-        list.removeAll("");
+-
+-        if (list.size() >= 3)
+-            version = list.at(2);
+-    }
++	QRegularExpression qe("-([^-]+)-[^-]+\n$");
+ 
+-    free(line);
+-    pclose(pp);
+-    return version;
++	QRegularExpressionMatch qem = qe.match(ba);
++	if (qem.hasMatch()) {
++		return qem.captured(1);
++	}
++	return "none";
+ }
+-- 
+2.43.0
+

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
+@@ -76,7 +76,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
+@@ -35,7 +35,7 @@
+ KYBAboutDialog *KYBAboutDialog::m_oInstance = nullptr;
+ QMutex          KYBAboutDialog::m_oMutex;
+ 
+-#define VERSION "3.2.0"
++#define VERSION "3.10.3"
+ 
+ #include <QDebug>
+ 
+-- 
+2.33.0
+

kylin-burner.spec

@@ -1,11 +1,14 @@
 Name:          kylin-burner
-Version:       3.10.2
+Version:       3.10.3
-Release:       4
+Release:       2
 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
+Patch04:       0001-kylin-burner-fix-version-showing-none-on-about-dialo.patch
 
 BuildRequires: cmake
 BuildRequires: qt5-qtx11extras-devel
@@ -28,6 +31,9 @@ CD/DVD burning application for UKUI.
 %prep
 %setup -q
 %patch01 -p1
+%patch02 -p1
+%patch03 -p1
+%patch04 -p1
 
 %build
 mkdir cmake-build
@@ -48,6 +54,18 @@ popd
 %{_datadir}/locale/zh_CN/LC_MESSAGES/kylin-burner.mo
 
 %changelog
+* Wed Apr 17 2024 houhongxun <houhongxun@kylinos.cn> - 3.10.3-2
+- fix version showing "none" on about dialog
+
+* 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