diff --git a/0001-fix-peony-open-terminal-fail.patch b/0001-fix-peony-open-terminal-fail.patch deleted file mode 100644 index 4857c018a5e4c588f5832710a8aa574b589fe8ed..0000000000000000000000000000000000000000 --- a/0001-fix-peony-open-terminal-fail.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c258419a0feb7b2f9b333f9c98a339ae2c5ef2af Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Thu, 20 Feb 2025 16:20:21 +0800 -Subject: [PATCH] fix peony open terminal fail - ---- - peony-menu-plugin-mate-terminal/mate-terminal-menu-plugin.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/peony-menu-plugin-mate-terminal/mate-terminal-menu-plugin.cpp b/peony-menu-plugin-mate-terminal/mate-terminal-menu-plugin.cpp -index 6437f58..5416747 100644 ---- a/peony-menu-plugin-mate-terminal/mate-terminal-menu-plugin.cpp -+++ b/peony-menu-plugin-mate-terminal/mate-terminal-menu-plugin.cpp -@@ -184,7 +184,7 @@ QList MateTerminalMenuPlugin::menuActions(Types types, const QString - - QAction *dirAction = new QAction(QIcon::fromTheme("utilities-terminal"), tr("Open Directory in Terminal"), nullptr); - dirAction->connect(dirAction, &QAction::triggered, [=](){ -- openTerminal(); -+ tryOpenAgain(); - }); - actions< MateTerminalMenuPlugin::menuActions(Types types, const QString - m_uri = selectionUris.first(); - QAction *dirAction = new QAction(QIcon::fromTheme("utilities-terminal"), tr("Open Directory in Terminal"), nullptr); - dirAction->connect(dirAction, &QAction::triggered, [=](){ -- openTerminal(); -+ tryOpenAgain(); - }); - actions<= 3.2.2+1015 +Requires: peony-extension-computer-view >= 3.2.2+1015 +Requires: peony-open-terminal >= 3.2.2+1015 +Requires: peony-send-to-device >= 3.2.2+1015 +Requires: peony-set-wallpaper >= 3.2.2+1015 +Requires: peony-share >= 3.2.2+1015 +Recommends: peony-device-rename +Recommends: ukui-bluetooth %description -Peony is the official file manager for the UKUI desktop. This -package adds extended functionality to the Peony file manager. - + Peony is the official file manager for the UKUI desktop. This package is a metapackage, which adds extended functionality to the Peony file manager. %package -n peony-share -Summary: Allows one to quickly share a folder from the Peony file manager -Requires: samba-common-tools samba acl - +Summary: Allows one to quickly share a folder from the Peony file manager +Requires: samba +Requires: samba-client +Requires: acl +Conflicts: peony-admin %description -n peony-share -The Peony share extension allows you to quickly share a folder from the -Peony file manager without requiring root access. It uses Samba, so your -folders can be accessed by any operating system. - + Peony is the official file manager for the UKUI desktop. This package adds extended functionality to the Peony file manager. . The Peony share extension allows you to quickly share a folder from the Peony file manager without requiring root access. It uses Samba, so your folders can be accessed by any operating system. %package -n parchives -Summary: Peony qt plugin for file compress and uncompress -Recommends: engrampa - +Summary: Peony qt plugin for file compress and uncompress +Recommends: engrampa %description -n parchives -Parchives is an archive manager for the UKUI environment. You can use -this plugin to compress or uncompress file or folder. -. -This package adds extended functionality to the Peony file manager. - + Parchives is an archive manager for the UKUI environment. You can use this plugin to compress or uncompress file or folder. . This package adds extended functionality to the Peony file manager. %package -n peony-open-terminal -Summary: Peony plugin for opening terminals in arbitrary local paths -Recommends: mate-terminal - +Summary: Peony plugin for opening terminals in arbitrary local paths +Recommends: mate-terminal %description -n peony-open-terminal -peony-open-terminal is a proof-of-concept Peony extension -which allows you to open a terminal in arbitrary local folders. - + Peony is the official file manager for the UKUI desktop. This package adds extended functionality to the Peony file manager. . peony-open-terminal is a proof-of-concept Peony extension which allows you to open a terminal in arbitrary local folders. %package -n peony-extension-computer-view -Summary: Peony plugin for displaying computer:/// with more information - +Summary: /// with more information %description -n peony-extension-computer-view -peony-extionsion-computer-view is a proof-of-concept Peony extension -which allows user browsering computer:/// with more information, which -not provided in icon view and list view. - + Peony is the official file manager for the UKUI desktop. This package adds extended functionality to the Peony file manager. . peony-extionsion-computer-view is a proof-of-concept Peony extension which allows user browsering computer:/// with more information, which not provided in icon view and list view. %package -n peony-set-wallpaper -Summary: Peony plugin for right click a picture to set as wallpaper -Requires: qt5-qtimageformats - +Summary: Peony plugin for right click a picture to set as wallpaper +Requires: qt5-qtimageformats %description -n peony-set-wallpaper -In addition to set wallpaper in ukui-control-center, you can select a -picture and right click to quickly set as wallpaper. - + Peony is the official file manager for the UKUI desktop. This package adds extended functionality to the Peony file manager. . In addition to set wallpaper in ukui-control-center, you can select a picture and right click to quickly set as wallpaper. %package -n peony-bluetooth -Summary: Peony plugin for right click a file to send to other devices via Bluetooth -Recommends: ukui-bluetooth - +Summary: Peony plugin for right click a file to send to other devices via Bluetooth +Recommends: ukui-bluetooth %description -n peony-bluetooth -In addition to sending files in ukui-bluetooth, you can also choose one -File, then right-click to quickly send the file. - + Peony is the official file manager for the UKUI desktop. This package adds extended functionality to the Peony file manager. . In addition to sending files in ukui-bluetooth, you can also choose one File, then right-click to quickly send the file. %package -n peony-send-to-device -Summary: Peony plugin for right click a file to send to mobile devices - +Summary: Peony plugin for right click a file to send to mobile devices %description -n peony-send-to-device -In addition to copy files to mobile device, you can also choose one -File, then right-click to quickly send the file. - + Peony is the official file manager for the UKUI desktop. This package adds extended functionality to the Peony file manager. . In addition to copy files to mobile device, you can also choose one File, then right-click to quickly send the file. %package -n peony-device-rename -Summary: Peony plugin for select a block device and rename it. This package adds extended functionality to the Peony file manager. - +Summary: Peony plugin for select a block device and rename it. This %description -n peony-device-rename -In this way, we can right click the device and quickly rename it, no need -to rename it use other tools like gparted. - + package adds extended functionality to the Peony file manager. . In this way, we can right click the device and quickly rename it, no need to rename it use other tools like gparted. %prep %autosetup -n %{name}-%{version} -p1 %build -export PATH=%{_qt5_bindir}:$PATH -mkdir qmake-build -pushd qmake-build -%{qmake_qt5} .. +mkdir build && pushd build +%{qmake_qt5} .. %{make_build} popd + %install -rm -rf $RPM_BUILD_ROOT -pushd qmake-build +pushd build %{make_install} INSTALL_ROOT=%{buildroot} popd -%clean -rm -rf $RPM_BUILD_ROOT - -%post -systemctl enable smb &> /dev/null ||: - -if [ ! -d '/var/lib/samba/usershares' ];then - mkdir -p /var/lib/samba/usershares -fi - -chmod 0770 /var/lib/samba/usershares -chmod +t /var/lib/samba/usershares +#peony-share +#parchives +#peony-open-terminal +#peony-extension-computer-view +#peony-set-wallpaper +#peony-bluetooth +#peony-send-to-device +#peony-device-rename -%files -%doc debian/control debian/copyright -%license COPYING %files -n peony-share +%{_prefix}/libexec/peony-samba-service +%{_datadir}/dbus-1/system-services/org.ukui.samba.share.config.service +%{_datadir}/dbus-1/system.d/org.ukui.samba.share.config.conf +%{_datadir}/polkit-1/actions/org.ukui.samba.share.config.policy %{_libdir}/peony-extensions/libpeony-share.so -%{_prefix}/share/polkit-1/actions -%{_prefix}/libexec/ -%{_datadir}/dbus-1/system.d/ -%{_datadir}/dbus-1/system-services/ %files -n parchives %{_libdir}/peony-extensions/libpeony-engrampa-menu-plugin.so @@ -166,7 +135,20 @@ chmod +t /var/lib/samba/usershares %files -n peony-device-rename %{_libdir}/peony-extensions/libpeony-drive-rename.so +%files +%license debian/copyright +%doc debian/changelog + + + + %changelog +* Tue Aug 19 2025 houhongxun - 4.10.0.0-1 +- Type: update +- ID : NA +- SUG : NA +- DESC: Update upstream version 4.10.0.0-ok2~0929 + * Thu Feb 20 2025 peijiankang - 4.0.0.0-2 - fix open terminal fail