diff --git a/0001-Fix-the-version-of-kylin-photo-viewer.patch b/0001-Fix-the-version-of-kylin-photo-viewer.patch deleted file mode 100644 index 16bd959e18f6372016057a7075a9b9996e1dffe3..0000000000000000000000000000000000000000 --- a/0001-Fix-the-version-of-kylin-photo-viewer.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9e00da4394cc3159edec55b95019e172772ecea0 Mon Sep 17 00:00:00 2001 -From: peijiankang -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 - diff --git a/kylin-photo-viewer-1.0.2.tar.gz b/kylin-photo-viewer-1.2.0.tar.gz similarity index 47% rename from kylin-photo-viewer-1.0.2.tar.gz rename to kylin-photo-viewer-1.2.0.tar.gz index ebe77731eb4e10eead5a6c5df6e7e95c679492e5..40486ae47c89f2f69d858b84db7263a052086bbe 100644 Binary files a/kylin-photo-viewer-1.0.2.tar.gz and b/kylin-photo-viewer-1.2.0.tar.gz differ diff --git a/kylin-photo-viewer.spec b/kylin-photo-viewer.spec index f9223dc3bed33cab525da50761c626e960d8b959..56e51be8f5b671a8904ba8ed579a5a4ee0372ead 100644 --- a/kylin-photo-viewer.spec +++ b/kylin-photo-viewer.spec @@ -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 - 1.2.0-1 +- update upstream version 1.2.0 + * Thu Jun 9 2022 peijiankang - 1.0.2-4 - add kylin-user-guide file