diff --git a/0001-fix-peony-share-failed-issue.patch b/0001-fix-peony-share-failed-issue.patch new file mode 100644 index 0000000000000000000000000000000000000000..69a868c934dbdba7037e3fb770bafee454df84b2 --- /dev/null +++ b/0001-fix-peony-share-failed-issue.patch @@ -0,0 +1,233 @@ +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-2.1.2.tar.gz b/peony-extensions-2.1.2.tar.gz deleted file mode 100644 index 6be92cc35e9f3e53bdb0bcd56ac4eb8e917d6f38..0000000000000000000000000000000000000000 Binary files a/peony-extensions-2.1.2.tar.gz and /dev/null differ diff --git a/peony-extensions-3.0.1.tar.gz b/peony-extensions-3.0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1af35e1729fde6e03982cb7b1613741ffab193e1 Binary files /dev/null and b/peony-extensions-3.0.1.tar.gz differ diff --git a/peony-extensions.spec b/peony-extensions.spec index 98ee9750704bacfb2389adca99b299bac0411497..109d556a14cac926bf9bd3160a0317dedb5d9c06 100644 --- a/peony-extensions.spec +++ b/peony-extensions.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: peony-extensions -Version: 2.1.2 -Release: 2 +Version: 3.0.1 +Release: 4 Summary: Peony qt extensions (common files) License: LGPL-3.0+ URL: http://www.ukui.org @@ -14,16 +14,20 @@ BuildRequires: glib2-devel BuildRequires: qt5-qtbase-devel BuildRequires: qtchooser BuildRequires: libpeony-dev -BuildRequires: libpeony2 +#BuildRequires: libpeony3 BuildRequires: peony BuildRequires: poppler-qt5-devel BuildRequires: gsettings-qt-devel Requires: samba-common-tools Requires: samba -#Requires: engrampa +Requires: engrampa Requires: mate-terminal -Requires: libpeony2 +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 @@ -31,32 +35,50 @@ Requires: libpeony2 %prep %setup -q +%patch0 -p1 %build -mkdir build && cd build -cmake .. -make +export PATH=%{_qt5_bindir}:$PATH +mkdir qmake-build +pushd qmake-build +%{qmake_qt5} .. +%{make_build} +popd %install rm -rf $RPM_BUILD_ROOT +pushd qmake-build +%{make_install} INSTALL_ROOT=%{buildroot} +popd -cd %{_builddir}/%{name}-%{version}/build -#make INSTALL_ROOT=/root/rpmbuild/BUILDROOT install - -mkdir -p %{buildroot}/usr/lib/peony-qt-extensions -cp -rf %{_builddir}/%{name}-%{version}/peony-extensions-cmake/peony-qt-share/libpeony-qt-share.* %{buildroot}/usr/lib/peony-qt-extensions - -cp -rf %{_builddir}/%{name}-%{version}/testdir/libpeony-qt-engrampa-menu-plugin.* %{buildroot}/usr/lib/peony-qt-extensions -cp -rf %{_builddir}/%{name}-%{version}/testdir/libpeony-qt-menu-plugin-mate-terminal.* %{buildroot}/usr/lib/peony-qt-extensions -cp -rf %{_builddir}/%{name}-%{version}/testdir/libpeony-qt-computer-view-plugin.so %{buildroot}/usr/lib/peony-qt-extensions %clean rm -rf $RPM_BUILD_ROOT +%post + +%preun + %files %doc debian/copyright debian/changelog -%{_prefix}/lib/peony-qt-extensions +%{_libdir}/peony-extensions +%{_prefix}/share/ %changelog +* Tue Dec 15 2020 douyan - 3.0.1-4 +- remove post script + +* Mon Dec 14 2020 douyan - 3.0.1-3 +- fix samba configure issue + +* Tue Dec 8 2020 douyan - 3.0.1-2 +- fix-peony-share-failed-issue + +* Wed Nov 11 2020 douyan - 3.0.1-1 +- update to upstream version 3.0.0-1+1031.1 + +* Mon Oct 26 2020 douyan - 3.0.0-1 +- update to upstream version 3.0.0 + * Tue Sep 22 2020 douyan - 2.1.2-2 - fix peony file share issue