diff --git a/0001-fix-peony-share-failed-issue.patch b/0001-fix-peony-share-failed-issue.patch deleted file mode 100644 index 69a868c934dbdba7037e3fb770bafee454df84b2..0000000000000000000000000000000000000000 --- a/0001-fix-peony-share-failed-issue.patch +++ /dev/null @@ -1,233 +0,0 @@ -diff -ur peony-extensions-3.0.1/peony-share/peony-share.pro peony-extensions-3.0.1~/peony-share/peony-share.pro ---- peony-extensions-3.0.1/peony-share/peony-share.pro 2019-05-27 15:48:18.000000000 +0800 -+++ peony-extensions-3.0.1~/peony-share/peony-share.pro 2020-12-08 10:21:43.000000000 +0800 -@@ -22,8 +22,8 @@ - share-properties-page-plugin.h - - TRANSLATIONS += translations/peony-share-extension_cs.ts \ -- translations/peony-admin-extension_tr.ts \ -- translations/peony-admin-extension_zh_CN.ts -+ translations/peony-share-extension_tr.ts \ -+ translations/peony-share-extension_zh_CN.ts - - RESOURCES += resources.qrc - -diff -ur peony-extensions-3.0.1/peony-share/share-page.cpp peony-extensions-3.0.1~/peony-share/share-page.cpp ---- peony-extensions-3.0.1/peony-share/share-page.cpp 2019-05-27 15:48:18.000000000 +0800 -+++ peony-extensions-3.0.1~/peony-share/share-page.cpp 2020-12-08 10:08:13.000000000 +0800 -@@ -34,6 +34,7 @@ - #include - - #include -+#include - - SharePage::SharePage(const QString &uri, QWidget *parent) : QWidget(parent) - { -@@ -125,6 +126,9 @@ - add emblem info to peony-qt's tags(emblems) & cloumns extensions frameworks. - before do it, i have to implement that frameworks first... - */ -+ } else { -+ //when have errors like samba config has issue or other errors, m_share_info.isShared could be false and return a warning. -+ QMessageBox::information(nullptr,tr("Error"),tr("Share failed. Please check samba config.")); - } - } else { - s->setVisible(false); -diff -ur peony-extensions-3.0.1/peony-share/translations/peony-share-extension_cs.ts peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_cs.ts ---- peony-extensions-3.0.1/peony-share/translations/peony-share-extension_cs.ts 2019-05-27 15:48:18.000000000 +0800 -+++ peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_cs.ts 2020-12-08 10:58:55.000000000 +0800 -@@ -11,12 +11,12 @@ - - Peony::SharePropertiesPagePlugin - -- -+ - Peony Qt Share Extension - Rozšíření do Peony Qt pro správu sdílení - - -- -+ - Allow user share folders - Umožnit uživateli sdílet složku - -@@ -24,29 +24,39 @@ - - SharePage - -- -+ - Share folder - Sdílet složku - - -- -+ - Share: - Zdroj: - - -- -+ - Read Only - Pouze pro čtení - - -- -+ - Allow Anonymous - Umožnit anonymní - - -- -+ - Comment: - Komentář: - -+ -+ -+ Error -+ -+ -+ -+ -+ Share failed. Please check samba config. -+ -+ - - -diff -ur peony-extensions-3.0.1/peony-share/translations/peony-share-extension_tr.ts peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_tr.ts ---- peony-extensions-3.0.1/peony-share/translations/peony-share-extension_tr.ts 2019-05-27 15:48:18.000000000 +0800 -+++ peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_tr.ts 2020-12-08 10:58:55.000000000 +0800 -@@ -11,12 +11,12 @@ - - Peony::SharePropertiesPagePlugin - -- -+ - Peony Qt Share Extension - Peony Qt Share Eklentisi - - -- -+ - Allow user share folders - Kullanıcı paylaşım klasörlerine izin ver - -@@ -24,29 +24,39 @@ - - SharePage - -- -+ - Share folder - Klasör paylaş - - -- -+ - Share: - Paylaş: - - -- -+ - Read Only - Sadece Okunabilir - - -- -+ - Allow Anonymous - Herkese İzin Ver - - -- -+ - Comment: - Yorum yap: - -+ -+ -+ Error -+ -+ -+ -+ -+ Share failed. Please check samba config. -+ -+ - - -二进制文件 peony-extensions-3.0.1/peony-share/translations/peony-share-extension_zh_CN.qm 和 peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_zh_CN.qm 不同 -diff -ur peony-extensions-3.0.1/peony-share/translations/peony-share-extension_zh_CN.ts peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_zh_CN.ts ---- peony-extensions-3.0.1/peony-share/translations/peony-share-extension_zh_CN.ts 2019-05-27 15:48:18.000000000 +0800 -+++ peony-extensions-3.0.1~/peony-share/translations/peony-share-extension_zh_CN.ts 2020-12-08 11:04:22.000000000 +0800 -@@ -1,6 +1,6 @@ - - -- -+ - - NetUsershareHelper - -@@ -11,12 +11,12 @@ - - Peony::SharePropertiesPagePlugin - -- -+ - Peony Qt Share Extension - 共享 - - -- -+ - Allow user share folders - 允许共享文件夹 - -@@ -24,29 +24,39 @@ - - SharePage - -- -+ - Share folder - 共享文件夹 - - -- -+ - Share: - 共享: - - -- -+ - Read Only - 只读 - - -- -+ - Allow Anonymous - 允许游客访问 - - -- -+ - Comment: - 注释: - -+ -+ -+ Error -+ 错误 -+ -+ -+ -+ Share failed. Please check samba config. -+ 分享失败。请检查samba设置。 -+ - - diff --git a/peony-extensions-3.0.1.tar.gz b/peony-extensions-3.0.1.tar.gz deleted file mode 100644 index 1af35e1729fde6e03982cb7b1613741ffab193e1..0000000000000000000000000000000000000000 Binary files a/peony-extensions-3.0.1.tar.gz and /dev/null differ diff --git a/peony-extensions-3.0.2.tar.gz b/peony-extensions-3.0.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..65696199ea4d80b491555a2be2f8008ddc43bd8b Binary files /dev/null and b/peony-extensions-3.0.2.tar.gz differ diff --git a/peony-extensions.spec b/peony-extensions.spec index 109d556a14cac926bf9bd3160a0317dedb5d9c06..a48e413f453644389c689ecc719a7a5cc40756e2 100644 --- a/peony-extensions.spec +++ b/peony-extensions.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: peony-extensions -Version: 3.0.1 -Release: 4 +Version: 3.0.2 +Release: 1 Summary: Peony qt extensions (common files) License: LGPL-3.0+ URL: http://www.ukui.org @@ -10,14 +10,13 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconf BuildRequires: glib2-devel -#BuildRequires: qt5-qmake BuildRequires: qt5-qtbase-devel BuildRequires: qtchooser BuildRequires: libpeony-dev -#BuildRequires: libpeony3 BuildRequires: peony BuildRequires: poppler-qt5-devel BuildRequires: gsettings-qt-devel +BuildRequires: qt5-linguist Requires: samba-common-tools Requires: samba @@ -27,15 +26,12 @@ Requires: libpeony3 Requires: qt5-qtimageformats Requires: polkit -patch0: 0001-fix-peony-share-failed-issue.patch - %description Peony is the official file manager for the UKUI desktop. This package adds extended functionality to the Peony file manager. %prep %setup -q -%patch0 -p1 %build export PATH=%{_qt5_bindir}:$PATH @@ -64,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/share/ %changelog +* Wed Feb 3 2021 lvhan - 3.0.2-1 +- update to upstream version 3.0.2-1 + * Tue Dec 15 2020 douyan - 3.0.1-4 - remove post script