!7 update upstream version 1.2.0

From: @tanyulong2021 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2022-12-23 01:30:03 +00:00 committed by Gitee
commit 6f95b1cbb5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 6 additions and 44 deletions

View File

@ -1,40 +0,0 @@
From 9e00da4394cc3159edec55b95019e172772ecea0 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 9 Jun 2022 11:34:59 +0800
Subject: [PATCH] Fix the version of kylin-photo-viewer
---
src/view/menumodule.cpp | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/view/menumodule.cpp b/src/view/menumodule.cpp
index a974db7..28e7aaa 100644
--- a/src/view/menumodule.cpp
+++ b/src/view/menumodule.cpp
@@ -207,6 +207,23 @@ QHBoxLayout* menuModule::initTitleBar(){
QVBoxLayout* menuModule::initBody(){
m_appVersion = VERSION_NEM;
+ QProcess proc;
+ QStringList options;
+ options << "-qa" << "|" << "grep" << "kylin-photo-viewer";
+ proc.start("rpm", options);
+ proc.waitForFinished();
+ QString dpkgInfo = proc.readAll();
+ QStringList infoList = dpkgInfo.split("\n");
+ for (int n = 0; n < infoList.size(); n++) {
+ QString strInfoLine = infoList[n];
+ if (strInfoLine.contains("kylin-photo-viewer")) {
+ QStringList lineInfoList = strInfoLine.split(QRegExp("-"));
+ if (lineInfoList.size() >= 3) {
+ m_appVersion = lineInfoList[3];
+ }
+ break;
+ }
+ }
// QLabel* bodyIcon = new QLabel();
QPushButton *bodyIcon = new QPushButton();
bodyIcon->setFixedSize(MICON_SIZEB);
--
2.33.0

Binary file not shown.

Binary file not shown.

View File

@ -1,12 +1,11 @@
%define debug_package %{nil}
Name: kylin-photo-viewer
Version: 1.0.2
Release: 4
Version: 1.2.0
Release: 1
Summary: kylin-photo-viewer
License: BSL-1.0 and Libpng and zlib and GPL-2.0-or-later
URL: https://github.com/UbuntuKylin/kylin-photo-viewer
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-Fix-the-version-of-kylin-photo-viewer.patch
BuildRequires: qt5-qtbase-devel
BuildRequires: qtchooser
@ -30,7 +29,6 @@ Photo viewer, support to view, zoom and rotate images of various formats
%prep
%setup -q
%patch1 -p1
%build
@ -68,10 +66,14 @@ cp -r %{_builddir}/%{name}-%{version}/data/pictures %{buildroot}/usr/share/kylin
%{_datadir}/glib-2.0/schemas/org.kylin.photo.viewer.gschema.xml
%{_datadir}/glib-2.0/schemas/org.ukui.log4qt.kylin-photo-viewer.gschema.xml
%{_datadir}/kylin-photo-viewer/translations/kylin-photo-viewer_zh_CN.qm
%{_datadir}/kylin-photo-viewer/translations/kylin-photo-viewer_bo_CN.qm
%{_datadir}/pixmaps/kyview_logo.png
%{_datadir}/kylin-user-guide/data/guide/
%changelog
* Mon Oct 24 2022 tanyulong <tanyulong@kylinos.cn> - 1.2.0-1
- update upstream version 1.2.0
* Thu Jun 9 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.2-4
- add kylin-user-guide file