packages/peony
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!31 Synchronize master branch, update to 3.10.0

Browse Source 
From: @hua_yadong 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2023-05-23 09:06:46 +00:00 committed by Gitee
commit 7a049a47e7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 13 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
0001-Change-the-folder-attribute-Time-Modified-to-Time-Created.patch
View File

@ -1,67 +0,0 @@
From 59c704e8afe87e9219014778faed4db7d3377339 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Wed, 28 Dec 2022 17:21:54 +0800
Subject: [PATCH] Change the folder attribute Time Modified to Time Created
---
libpeony-qt/controls/property-page/basic-properties-page.cpp | 2 +-
translations/libpeony-qt/libpeony-qt_tr.ts | 4 ++--
translations/libpeony-qt/libpeony-qt_zh_CN.ts | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libpeony-qt/controls/property-page/basic-properties-page.cpp b/libpeony-qt/controls/property-page/basic-properties-page.cpp
index 2d4c7fc..73fd2db 100644
--- a/libpeony-qt/controls/property-page/basic-properties-page.cpp
+++ b/libpeony-qt/controls/property-page/basic-properties-page.cpp
@@ -386,7 +386,7 @@ void BasicPropertiesPage::initFloorThree(BasicPropertiesPage::FileType fileType)
case BP_MultipleFIle:
case BP_Folder:
m_timeCreatedLabel = this->createFixedLabel(0,32,floor3);
- layout3->addRow(this->createFixedLabel(m_labelWidth,32,tr("Time Modified:"),floor3), m_timeCreatedLabel);
+ layout3->addRow(this->createFixedLabel(m_labelWidth,32,tr("Time Created:"),floor3), m_timeCreatedLabel);
default:
break;
}
diff --git a/translations/libpeony-qt/libpeony-qt_tr.ts b/translations/libpeony-qt/libpeony-qt_tr.ts
index 01c67c8..f85ef21 100644
--- a/translations/libpeony-qt/libpeony-qt_tr.ts
+++ b/translations/libpeony-qt/libpeony-qt_tr.ts
@@ -607,13 +607,13 @@
<translation></translation>
</message>
<message>
+ <location filename="../../libpeony-qt/controls/property-page/basic-properties-page.cpp" line="389"/>
<source>Time Created:</source>
- <translation type="vanished">Oluşturma Zamanı:</translation>
+ <translation>Oluşturma Zamanı:</translation>
</message>
<message>
<location filename="../../libpeony-qt/controls/property-page/basic-properties-page.cpp" line="90"/>
<location filename="../../libpeony-qt/controls/property-page/basic-properties-page.cpp" line="383"/>
- <location filename="../../libpeony-qt/controls/property-page/basic-properties-page.cpp" line="389"/>
<source>Time Modified:</source>
<translation>Değiştirme Zamanı:</translation>
</message>
diff --git a/translations/libpeony-qt/libpeony-qt_zh_CN.ts b/translations/libpeony-qt/libpeony-qt_zh_CN.ts
index 9bf2358..3d74b7a 100644
--- a/translations/libpeony-qt/libpeony-qt_zh_CN.ts
+++ b/translations/libpeony-qt/libpeony-qt_zh_CN.ts
@@ -612,13 +612,13 @@
<translation>yyyy年MM月dd日, hh:mm:ss AP</translation>
</message>
<message>
+ <location filename="../../libpeony-qt/controls/property-page/basic-properties-page.cpp" line="389"/>
<source>Time Created:</source>
- <translation type="vanished">创建时间：</translation>
+ <translation>创建时间：</translation>
</message>
<message>
<location filename="../../libpeony-qt/controls/property-page/basic-properties-page.cpp" line="90"/>
<location filename="../../libpeony-qt/controls/property-page/basic-properties-page.cpp" line="383"/>
- <location filename="../../libpeony-qt/controls/property-page/basic-properties-page.cpp" line="389"/>
<source>Time Modified:</source>
<translation>修改时间：</translation>
</message>
--
2.33.0

BIN
peony-3.10.0.tar.gz Normal file
View File

Binary file not shown.

BIN
peony-3.2.4.tar.gz
View File

Binary file not shown.

24
peony.spec
View File

@ -1,13 +1,10 @@
%define debug_package %{nil}
Name: peony
Version: 3.2.4
Release: 5
Version: 3.10.0
Release: 2
Summary: file Manager for the UKUI desktop
License: GPL-3.0-or-later and MIT and BSD-3-Clause
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-Change-the-folder-attribute-Time-Modified-to-Time-Created.patch
BuildRequires: libudisks2-devel
BuildRequires: libnotify-devel
@ -18,6 +15,8 @@ BuildRequires: kf5-kwayland
BuildRequires: kf5-kwayland-devel
BuildRequires: wayland-devel
BuildRequires: qt5-qttools-devel
BuildRequires: ukui-interface
BuildRequires: bamf-devel qt5-qtsvg-devel qt5-qtdeclarative-devel
Requires: peony-common, libpeony3
Requires: qt5-qttranslations
@ -78,16 +77,15 @@ Provides: libpeony
%prep
%setup -q
%patch01 -p1
%build
qmake-qt5
make
%{qmake_qt5}
%{make_build}
%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=%{buildroot} install
%{make_install} INSTALL_ROOT=%{buildroot}
#peony-common
mkdir -p %{buildroot}/usr/share/dbus-1/interfaces
@ -118,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/dbus-1/interfaces/*
%{_datadir}/dbus-1/services/*
%{_datadir}/glib-2.0/schemas/org.ukui.peony.settings.gschema.xml
%{_datadir}/glib-2.0/schemas/org.ukui.peony.desktop.settings.gschema.xml
%{_datadir}/peony-qt/*
%{_datadir}/peony-qt-desktop/*
%{_datadir}/kylin-user-guide/data/guide/peony
@ -134,8 +133,11 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/%{_lib}/*.so
%changelog
* Wed Dec 28 2022 peijiankang <peijiankang@kylinos.cn> - 3.2.4-5
- Change the folder attribute Time Modified to Time Created
* Tue Feb 07 2023 peijiankang <peijiankang@kylinos.cn> - 3.10.0-2
- add build debuginfo and debugsource
* Mon Nov 14 2022 tanyulong <tanyulong@kylinos.cn> - 3.10.0-1
- update version 3.10.0
* Wed Jul 13 2022 peijiankang <peijiankang@kylinos.cn> - 3.2.4-4
- add qt5-qttranslations