!22 [sync] PR-21: sync 22.09 to master

From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

0002-modify-version-is-error.patch

@@ -0,0 +1,44 @@
+From 0a18f3ddd4f6effc425dd27225dd7e0d728656e6 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Mon, 22 Aug 2022 14:23:24 +0800
+Subject: [PATCH] modify version is error
+
+---
+ UI/titlebar/menumodule.cpp | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/UI/titlebar/menumodule.cpp b/UI/titlebar/menumodule.cpp
+index 2bb5958..7265fba 100644
+--- a/UI/titlebar/menumodule.cpp
++++ b/UI/titlebar/menumodule.cpp
+@@ -283,6 +283,27 @@ QVBoxLayout* menuModule::initBody(){
+ 
+ //    bodyAppName->setStyleSheet("font-size:18px;");
+ //    bodyAppVersion->setFixedHeight(24);
++    FILE *pp = NULL;
++    char *line = NULL;
++    char *q = NULL;
++    size_t len = 0;
++
++    pp = popen("rpm -q kylin-music", "r");
++    if(pp) { while(getline(&line, &len, pp) != -1){
++        q = strrchr(line, '\n');
++        *q = '\0';
++        QString content = line;
++        QStringList list = content.split("-");
++        if (list.size() >= 3)
++            appVersion = list.at(2);
++        }
++    }
++    if(line){
++        free(line);
++       	line = NULL;
++    }
++    pclose(pp);
++
+     bodyAppVersion->setText(tr("Version: ") + appVersion);
+     bodyAppVersion->setAlignment(Qt::AlignLeft);
+ //    bodyAppVersion->setStyleSheet("font-size:14px;");
+-- 
+2.33.0
+

kylin-music.spec

@@ -1,14 +1,14 @@
 %define debug_package %{nil}
 Name:           kylin-music
 Version:        1.1.2
-Release:        3
+Release:        6
 Summary:        kylin-music
 License:        GPL-3.0-or-later and MIT
 URL:            https://github.com/UbuntuKylin/kylin-music
 Source0:        %{name}-%{version}.tar.gz
-Source1:        libsimple.so
 
 patch0:	      	0001-fix-compile-error-of-kylin-music.patch
+patch1:         0002-modify-version-is-error.patch
 
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qtchooser
@@ -25,19 +25,24 @@ BuildRequires:  ukui-interface libpeony3 libpeony-dev
 BuildRequires:  mpv-libs-devel
 BuildRequires:  sqlite-devel libXtst-devel
 
-
 %description
 kylin-music
 
 
 %prep
-
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-
 export PATH=%{_qt5_bindir}:$PATH
+pushd kylin-music-plugins-simple
+mkdir build
+pushd build
+cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr
+%{make_build}
+popd
+popd
 
 mkdir qmake-build
 pushd qmake-build
@@ -46,22 +51,26 @@ pushd qmake-build
 popd 
 
 %install
+export PATH=%{_qt5_bindir}:$PATH
+pushd kylin-music-plugins-simple
+pushd build
+%{make_install} INSTALL_ROOT=%{buildroot}
+popd
+popd
 
 pushd qmake-build
 %{make_install} INSTALL_ROOT=%{buildroot}
 popd 
 
 mkdir -p %{buildroot}/usr/share/kylin-user-guide/data/guide
-mkdir -p %{buildroot}/usr/lib64
 
 cp -r %{_builddir}/%{name}-%{version}/data/kylin-music %{buildroot}/usr/share/kylin-user-guide/data/guide/
-cp -r %{SOURCE1} %{buildroot}/usr/lib64
 
 %files
 %doc debian/changelog
 %license  debian/copyright 
-%{_bindir}/kylin-music
+%{_bindir}/*
-%{_libdir}/*
+%{_libdir}/libsimple.so
 %{_datadir}/applications/kylin-music.desktop
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/pixmaps/kylin-music.png
@@ -69,6 +78,15 @@ cp -r %{SOURCE1} %{buildroot}/usr/lib64
 %{_datadir}/kylin-user-guide/data/guide/*
 
 %changelog
+* Mon Aug 22 2022 peijiankang <peijiankang@kylinos.cn> - 1.1.2-6
+- modify version is error
+
+* Mon Aug 22 2022 peijiankang <peijiankang@kylinos.cn> - 1.1.2-5
+- fix aarch64 install error
+
+* Wed Aug 17 2022 peijiankang <peijiankang@kylinos.cn> - 1.1.2-4
+- fix nothing provides libpthread.so.0
+
 * Thu Jun 16 2022 peijiankang <peijiankang@kylinos.cn> - 1.1.2-3
 - remove kylin-music_zh_CN.qm