From d536cf785de4f654da7c2ae5abf3377d64d7c1d86a2f72080b3d4e666faf1550 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 16 May 2017 20:14:34 +0000 Subject: [PATCH 1/3] Accepting request 495111 from home:wolfi323:branches:KDE:Extra - Update to 2.6.0 - Add fix-build-with-gcc48.patch to fix build on Leap 42 - Add org.kde.krusader.root-mode.desktop, it got removed in 2.6.0 OBS-URL: https://build.opensuse.org/request/show/495111 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krusader?expand=0&rev=23 --- 0001-Don-t-hardcode-appdata-location.patch | 26 ---- Handle-arrow-key-press-in-brief-view.patch | 81 ----------- ...es-from-krarc-archive-mime-type-list.patch | 32 ----- ...ce-actions-to-right-click-popup-menu.patch | 78 ---------- fix-build-with-gcc48.patch | 40 ++++++ krusader-2.5.0-generate-manpage.patch | 9 -- krusader-2.5.0.tar.xz | 3 - krusader-2.6.0.tar.xz | 3 + krusader.changes | 80 +++++++++++ krusader.spec | 42 +++--- org.kde.krusader.root-mode.desktop | 136 ++++++++++++++++++ 11 files changed, 277 insertions(+), 253 deletions(-) delete mode 100644 0001-Don-t-hardcode-appdata-location.patch delete mode 100644 Handle-arrow-key-press-in-brief-view.patch delete mode 100644 Remove-non-archive-mimetypes-from-krarc-archive-mime-type-list.patch delete mode 100644 add-service-actions-to-right-click-popup-menu.patch create mode 100644 fix-build-with-gcc48.patch delete mode 100644 krusader-2.5.0-generate-manpage.patch delete mode 100644 krusader-2.5.0.tar.xz create mode 100644 krusader-2.6.0.tar.xz create mode 100644 org.kde.krusader.root-mode.desktop diff --git a/0001-Don-t-hardcode-appdata-location.patch b/0001-Don-t-hardcode-appdata-location.patch deleted file mode 100644 index 41b8a3c..0000000 --- a/0001-Don-t-hardcode-appdata-location.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 84bf36bf7f9f7cbbc5883c7aba405cb5b5d32460 Mon Sep 17 00:00:00 2001 -From: Hrvoje Senjan -Date: Sun, 23 Oct 2016 19:28:08 +0200 -Subject: [PATCH 1/1] Don't hardcode appdata location - -We have a var for that ---- - krusader/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/krusader/CMakeLists.txt b/krusader/CMakeLists.txt -index e3d92cf..c300722 100644 ---- a/krusader/CMakeLists.txt -+++ b/krusader/CMakeLists.txt -@@ -96,7 +96,7 @@ install(FILES midnight_commander.color - splash.png - DESTINATION ${DATA_INSTALL_DIR}/krusader) - install(FILES org.kde.krusader.appdata.xml -- DESTINATION ${SHARE_INSTALL_PREFIX}/appdata) -+ DESTINATION ${KDE_INSTALL_METAINFODIR}) - - ecm_install_icons(ICONS - icons/16-apps-krusader_blue.png --- -2.10.0 - diff --git a/Handle-arrow-key-press-in-brief-view.patch b/Handle-arrow-key-press-in-brief-view.patch deleted file mode 100644 index 0601606..0000000 --- a/Handle-arrow-key-press-in-brief-view.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 991d28b4c9d14d860583cffd2b778d0f46c4f528 Mon Sep 17 00:00:00 2001 -From: Alexander Bikadorov -Date: Thu, 29 Dec 2016 18:28:09 +0100 -Subject: FIXED: [ 374238 ] Handle left/right arrow key press in brief view - (previously filtered by search bar). - -Quickfix. It is maybe better to remove the filtering in KrSearchBar and instead get all key events from KrView. -Bug came with 374238. - -BUG: 374238 ---- - krusader/Panel/krinterbriefview.cpp | 22 ++++++++++++++++------ - krusader/Panel/krinterbriefview.h | 2 ++ - 2 files changed, 18 insertions(+), 6 deletions(-) - -diff --git a/krusader/Panel/krinterbriefview.cpp b/krusader/Panel/krinterbriefview.cpp -index fcf4898..f4d38b8 100644 ---- a/krusader/Panel/krinterbriefview.cpp -+++ b/krusader/Panel/krinterbriefview.cpp -@@ -146,9 +146,19 @@ void KrInterBriefView::keyPressEvent(QKeyEvent *e) - { - if (!e || !_model->ready()) - return ; // subclass bug -- if ((e->key() != Qt::Key_Left && e->key() != Qt::Key_Right) && -- (handleKeyEvent(e))) // did the view class handled the event? -+ -+ if (handleKeyEvent(e)) - return; -+ -+ QAbstractItemView::keyPressEvent(e); -+} -+ -+bool KrInterBriefView::handleKeyEvent(QKeyEvent *e) -+{ -+ if ((e->key() != Qt::Key_Left && e->key() != Qt::Key_Right) && -+ (KrView::handleKeyEvent(e))) // did the view class handled the event? -+ return true; -+ - switch (e->key()) { - case Qt::Key_Right : { - if (e->modifiers() == Qt::ControlModifier) { // let the panel handle it -@@ -178,7 +188,7 @@ void KrInterBriefView::keyPressEvent(QKeyEvent *e) - } - if (e->modifiers() & Qt::ShiftModifier) - op()->emitSelectionChanged(); -- break; -+ return true; - } - case Qt::Key_Left : { - if (e->modifiers() == Qt::ControlModifier) { // let the panel handle it -@@ -208,11 +218,11 @@ void KrInterBriefView::keyPressEvent(QKeyEvent *e) - } - if (e->modifiers() & Qt::ShiftModifier) - op()->emitSelectionChanged(); -- break; -+ return true; - } -- default: -- QAbstractItemView::keyPressEvent(e); - } -+ -+ return false; - } - - void KrInterBriefView::wheelEvent(QWheelEvent *ev) -diff --git a/krusader/Panel/krinterbriefview.h b/krusader/Panel/krinterbriefview.h -index 6bc133b..88b286a 100644 ---- a/krusader/Panel/krinterbriefview.h -+++ b/krusader/Panel/krinterbriefview.h -@@ -77,6 +77,8 @@ protected slots: - virtual void renameCurrentItem() Q_DECL_OVERRIDE; - - protected: -+ // ---- reimplemented from KrView ---- -+ virtual bool handleKeyEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - // ---- reimplemented from QAbstractItemView ---- - virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; - virtual void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; --- -cgit v0.11.2 - diff --git a/Remove-non-archive-mimetypes-from-krarc-archive-mime-type-list.patch b/Remove-non-archive-mimetypes-from-krarc-archive-mime-type-list.patch deleted file mode 100644 index b5fc22d..0000000 --- a/Remove-non-archive-mimetypes-from-krarc-archive-mime-type-list.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e3fad5256a5cba9f908f1f5d951907c6194040b5 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" -Date: Sat, 19 Nov 2016 13:14:00 +0100 -Subject: Remove non-archive mimetypes from krarc archive mime type list - -Putting non-archive mimetypes in the list of archive mimetypes confuses -other applications using KIO, like Dolphin. Getting Krusader to open -normal files as archives should be done by linking them in the Krusader -Protocol settings. - -BUG: 371765 -REVIEW: 129434 ---- - krArc/krarc.protocol | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/krArc/krarc.protocol b/krArc/krarc.protocol -index 121a9d1..9783afd 100644 ---- a/krArc/krarc.protocol -+++ b/krArc/krarc.protocol -@@ -1,7 +1,7 @@ - [Protocol] - exec=kio_krarc - protocol=krarc --archiveMimetype=application/x-7z,application/x-7z-compressed,application/x-ace,application/x-ace-compressed,application/x-arj,application/x-arj-compressed,application/x-cpio,application/x-deb,application/x-debian-package,application/vnd.debian.binary-package,application/x-java-archive,application/x-lha,application/x-lha-compressed,application/x-rar,application/x-rar-compressed,application/x-rpm,application/x-source-rpm,application/zip,application/x-zip,application/x-zip-compressed,application/vnd.oasis.opendocument.chart,application/vnd.oasis.opendocument.database,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.text,application/vnd.openxmlformats-officedocument.presentationml.presentation,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/x-cbz,application/x-cbr,application/epub+zip,application/x-webarchive,application/x-plasma -+archiveMimetype=application/x-7z,application/x-7z-compressed,application/x-ace,application/x-ace-compressed,application/x-arj,application/x-arj-compressed,application/x-cpio,application/x-lha,application/x-lha-compressed,application/x-rar,application/x-rar-compressed,application/zip,application/x-zip,application/x-zip-compressed - input=filesystem - output=filesystem - listing=Name,Type,Size,Date,Access,Owner,Group,Link --- -cgit v0.11.2 - diff --git a/add-service-actions-to-right-click-popup-menu.patch b/add-service-actions-to-right-click-popup-menu.patch deleted file mode 100644 index c92e192..0000000 --- a/add-service-actions-to-right-click-popup-menu.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 5c6059fbd30365dbd036db556a38019fd7a84872 Mon Sep 17 00:00:00 2001 -From: Alexander Bikadorov -Date: Wed, 16 Nov 2016 16:39:40 +0100 -Subject: FIXED: [ 372231 ] Added KDE's service actions again to right-click - popup menu - -BUG: 372231 - -KFileItemActions::addServiceActionsTo() is not deprecated so we should continue using it like before. ---- - krusader/Panel/krpopupmenu.cpp | 22 ++++++++-------------- - krusader/Panel/krpopupmenu.h | 2 +- - 2 files changed, 9 insertions(+), 15 deletions(-) - -diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp -index 7eac4a9..bfb33d1 100644 ---- a/krusader/Panel/krpopupmenu.cpp -+++ b/krusader/Panel/krpopupmenu.cpp -@@ -63,9 +63,8 @@ void KrPopupMenu::run(const QPoint &pos, KrPanel *panel) - /** - * Copied from dolphin/src/dolphincontextmenu.cpp and modified to add only compress and extract submenus. - */ --bool KrPopupMenu::addCompressAndExtractPluginActions() -+void KrPopupMenu::addCompressAndExtractPluginActions() - { -- - KFileItemListProperties props(_items); - - QVector jsonPlugins = KPluginLoader::findPlugins("kf5/kfileitemaction", -@@ -81,8 +80,6 @@ bool KrPopupMenu::addCompressAndExtractPluginActions() - addActions(abstractPlugin->actions(props, this)); - } - } -- -- return !jsonPlugins.isEmpty(); - } - - KrPopupMenu::KrPopupMenu(KrPanel *thePanel, QWidget *parent) : QMenu(parent), panel(thePanel), empty(false), -@@ -189,16 +186,13 @@ KrPopupMenu::KrPopupMenu(KrPanel *thePanel, QWidget *parent) : QMenu(parent), pa - uAct->setText(i18n("User Actions")); - - // add compress and extract plugins (if available) -- bool success = addCompressAndExtractPluginActions(); -- -- /* -- * When KF 5.25 is adopted by all distros, we can remove these 2 lines (and corresponding code) -- * because since KF 5.25 compress and extract submenus are standalone plugins. -- */ -- if (!success) { -- fileItemActions.setItemListProperties(KFileItemListProperties(_items)); -- fileItemActions.addServiceActionsTo(this); -- } -+ addCompressAndExtractPluginActions(); -+ -+ // NOTE: design and usability problem here. Services disabled in kservicemenurc settings won't -+ // be added to the menu. But Krusader does not provide a way do change these settings (only -+ // Dolphin does). -+ fileItemActions.setItemListProperties(KFileItemListProperties(_items)); -+ fileItemActions.addServiceActionsTo(this); - - addSeparator(); - -diff --git a/krusader/Panel/krpopupmenu.h b/krusader/Panel/krpopupmenu.h -index 2d16818..b20dcf8 100644 ---- a/krusader/Panel/krpopupmenu.h -+++ b/krusader/Panel/krpopupmenu.h -@@ -44,7 +44,7 @@ protected: - void performAction(int id); - void addEmptyMenuEntries(); // adds the choices for a menu without selected items - void addCreateNewMenu(); // adds a "create new" submenu -- bool addCompressAndExtractPluginActions(); // adds various plugin actions -+ void addCompressAndExtractPluginActions(); // adds various plugin actions - - enum ID { - OPEN_ID, --- -cgit v0.11.2 - diff --git a/fix-build-with-gcc48.patch b/fix-build-with-gcc48.patch new file mode 100644 index 0000000..c45d3d6 --- /dev/null +++ b/fix-build-with-gcc48.patch @@ -0,0 +1,40 @@ +From 846658caafc012d9706d0c6517195fcdb95c2f9a Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +Date: Sun, 7 May 2017 22:42:57 +0200 +Subject: Fix build with gcc 4.8 + +When trying to build krusader 2.6.0 with gcc 4.8, I got this error +message: +/home/abuild/rpmbuild/BUILD/krusader-2.6.0/krusader/FileSystem/sizecalculator.cpp: +In member function 'void SizeCalculator::slotStatResult(KJob*)': +/home/abuild/rpmbuild/BUILD/krusader-2.6.0/krusader/FileSystem/sizecalculator.cpp:139:98: +error: no matching function for call to +'SizeCalculator::connect(QPointer&, void +(KJob::*)(KJob*, KJob::QPrivateSignal), SizeCalculator* const, void +(SizeCalculator::*)(KJob*))' + connect(m_directorySizeJob, &KIO::Job::result, this, +&SizeCalculator::slotDirectorySizeResult); + ^ +This patch fixes the problem. + +Differential Revision: https://phabricator.kde.org/D5714 +--- + krusader/FileSystem/sizecalculator.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/krusader/FileSystem/sizecalculator.cpp b/krusader/FileSystem/sizecalculator.cpp +index aabe63d..eeb050f 100644 +--- a/krusader/FileSystem/sizecalculator.cpp ++++ b/krusader/FileSystem/sizecalculator.cpp +@@ -151,7 +151,7 @@ void SizeCalculator::slotStatResult(KJob *job) + m_totalDirs++; + + m_directorySizeJob = KIO::directorySize(url); +- connect(m_directorySizeJob, &KIO::Job::result, this, &SizeCalculator::slotDirectorySizeResult); ++ connect(m_directorySizeJob.data(), &KIO::Job::result, this, &SizeCalculator::slotDirectorySizeResult); + } + + void SizeCalculator::slotDirectorySizeResult(KJob *) +-- +cgit v0.11.2 + diff --git a/krusader-2.5.0-generate-manpage.patch b/krusader-2.5.0-generate-manpage.patch deleted file mode 100644 index 171b262..0000000 --- a/krusader-2.5.0-generate-manpage.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- krusader-2.5.0.orig/doc/en/CMakeLists.txt 2016-10-22 15:31:15.000000000 +0200 -+++ krusader-2.5.0/doc/en/CMakeLists.txt 2016-10-23 19:08:08.400469349 +0200 -@@ -2,3 +2,6 @@ kdoctools_create_handbook(index.docbook - INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en - SUBDIR krusader) - -+kdoctools_create_manpage(man-krusader.1.docbook -+ 1 -+ INSTALL_DESTINATION ${MAN_INSTALL_DIR}) diff --git a/krusader-2.5.0.tar.xz b/krusader-2.5.0.tar.xz deleted file mode 100644 index d831c3f..0000000 --- a/krusader-2.5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb9f4b237378fd5d86d5c0202b9d714f3d8dfe549ba9e7926f6f9de60b5088d7 -size 2704584 diff --git a/krusader-2.6.0.tar.xz b/krusader-2.6.0.tar.xz new file mode 100644 index 0000000..c6f0160 --- /dev/null +++ b/krusader-2.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7061a43cada6bd7df991ed2e3e5193b1d99144fa426c8331a2b54170b79b3a39 +size 2726928 diff --git a/krusader.changes b/krusader.changes index 39c4b6d..ddd5e5b 100644 --- a/krusader.changes +++ b/krusader.changes @@ -1,3 +1,83 @@ +------------------------------------------------------------------- +Mon May 15 19:54:35 UTC 2017 - wbauer@tmo.at + +- Add org.kde.krusader.root-mode.desktop, it got removed in 2.6.0 + +------------------------------------------------------------------- +Sun May 7 20:50:43 UTC 2017 - wbauer@tmo.at + +- Add fix-build-with-gcc48.patch to fix build on Leap 42 + +------------------------------------------------------------------- +Tue Apr 11 18:36:36 UTC 2017 - wbauer@tmo.at + +- Update to 2.6.0 + * FIXED: (kde#335993) save checksum does not work as expected + * FIXED: (kde#375639) Allow typing special characters (e.g. with + accent or acute) in search bar + * FIXED: (kde#328068) Send SIGINT before own input command to + embedded terminal + * FIXED: (kde#375135) segfault on viewing html files with Generic + viewer + * FIXED: (kde#269820) Fullscreen terminal emulator shows empty + window when terminal emulator was minimized + * FIXED: (kde#374813) Multi rename with KRename does not work + when selecting non-local files/folders (ftp, smb, virt, ...) + * FIXED: (kde#309300) Esc as the default shortcut of "Set Focus + to The Panel" is problematic for the embedded terminal + * FIXED: (kde#374175) wrong date format parsing using date filter + in search dialog + * FIXED: (kde#293370) After a file deletion old file name is + still shown in the status bar + * FIXED: (kde#374322) Visually indicated shortcut ALT+o not + working in copy/F5 and move/F6 KrDialog + * FIXED: (kde#374238) Handle left/right arrow key press in brief + view (previously filtered by search bar). + * FIXED: when dragged from list panel use correct drop action if + invoked with modifier keys + * FIXED: added save/restore or toolbar positions in mainwindow + * FIXED: (kde#372231) Added KDE's service actions again to + right-click popup menu + * ADDED: new undo action to job manager for undoing KIO job + operations + * FIXED: (kde#372067) Wrong path when showing non local files and + folders from search dialog in panel + * ADDED: job manager as replacement for queue manager. Part of + cleaning VFS + * FIXED: (kde#365105) Workaround for bug in KF5+QSystemTrayIcon + * ADDED: Reimplementation of "minimize to system tray" feature. + * FIXED: Krusader does not show the new file in a directory that + is a symbolic link until is not refresh directory + * FIXED: Wrong window position after restart in fluxbox + * FIXED: Error on opening file folder after clicking on any file + result of a remote search (FTP / smb) + * FIXED: Terminal opens in full window + * FIXED: copy location/path bar (feature request) + * FIXED: krusader cannot calculate size of remote directory (ftp + or sftp) + * FIXED: Some files with weird characters (non UTF) cause krusader + to miscalculate folder size + * FIXED: No way to focus fullscreen embedded terminal emulator. + * FIXED: Don't delete first letter in "new folder" dialog (F7) + * FIXED: Use Shift+Delete for delete or move selected files to + trash + * FIXED: Dialog "File" -> "Verify checksum" improvement + * FIXED: Option for show copy/move progress in dialog (not in + notifications) + * FIXED: Documents suddenly open as archives + * CHANGED: Avoiding root mode + * CHANGED: Duplicated tab should not be locked + * CHANGED: New PagePanel: do not refresh until panel becomes + visible + * CHANGED: Change suggested command for "edit as root" user + action to a more secure alternative + * CHANGED: Do not configure kdesu path and remove kdesudo support + again + * CHANGED: Panel: Do not select .. in a filtered view if there + are other entries + * CHANGED: Duplicate tab settings when duplicating tabs + * CHANGED: Some fixes and simpifying startup settings. + ------------------------------------------------------------------- Thu Jan 5 21:20:49 UTC 2017 - wbauer@tmo.at diff --git a/krusader.spec b/krusader.spec index af835d4..00e8c5f 100644 --- a/krusader.spec +++ b/krusader.spec @@ -1,7 +1,7 @@ # # spec file for package krusader # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: krusader -Version: 2.5.0 +Version: 2.6.0 Release: 0 Summary: A File Manager License: GPL-2.0+ @@ -25,17 +25,10 @@ Group: Productivity/File utilities Url: https://krusader.org/ Source: http://download.kde.org/stable/krusader/%{version}/%{name}-%{version}.tar.xz Source1: krusader_browse_iso.desktop -# PATCH-FIX-OPENSUSE krusader-2.5.0-generate-manpage.patch -- generate manpage -Patch0: krusader-2.5.0-generate-manpage.patch -# PATCH-FIX-UPSTREAM 0001-Don-t-hardcode-appdata-location.patch -Patch1: 0001-Don-t-hardcode-appdata-location.patch -# PATCH-FIX-UPSTREAM Remove-non-archive-mimetypes-from-krarc-archive-mime-type-list.patch boo#1011320, kde#371765 -- fixes dolphin opening e.g. LibreOffice files as archives -Patch2: Remove-non-archive-mimetypes-from-krarc-archive-mime-type-list.patch -# PATCH-FIX-UPSTREAM add-service-actions-to-right-click-popup-menu.patch boo#1016980, kde#372231 -- add KDE's service actions to the right click popup menu in krusader again -Patch3: add-service-actions-to-right-click-popup-menu.patch -# PATCH-FIX-UPSTREAM Handle-arrow-key-press-in-brief-view.patch boo#1017533, kde#374238 -- fixes behavior when pressing the left/right cursor keys in brief view -Patch4: Handle-arrow-key-press-in-brief-view.patch -BuildRequires: extra-cmake-modules >= 1.1.0 +Source2: org.kde.krusader.root-mode.desktop +# PATCH-FIX-UPSTREAM +Patch: fix-build-with-gcc48.patch +BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: libacl-devel BuildRequires: libattr-devel @@ -60,12 +53,13 @@ BuildRequires: cmake(KF5Wallet) BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5Core) >= 5.2.0 -BuildRequires: cmake(Qt5DBus) >= 5.2.0 -BuildRequires: cmake(Qt5Gui) >= 5.2.0 -BuildRequires: cmake(Qt5PrintSupport) >= 5.2.0 -BuildRequires: cmake(Qt5Widgets) >= 5.2.0 -BuildRequires: cmake(Qt5Xml) >= 5.2.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.5.0 +BuildRequires: cmake(Qt5Core) >= 5.5.0 +BuildRequires: cmake(Qt5DBus) >= 5.5.0 +BuildRequires: cmake(Qt5Gui) >= 5.5.0 +BuildRequires: cmake(Qt5PrintSupport) >= 5.5.0 +BuildRequires: cmake(Qt5Widgets) >= 5.5.0 +BuildRequires: cmake(Qt5Xml) >= 5.5.0 Requires: kio_iso = %{version} Suggests: %{name}-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -92,11 +86,7 @@ An advanced twin panel (commander style) file manager for KDE. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%patch -p1 %build export RPM_OPT_FLAGS="%{optflags} -fpermissive" @@ -107,6 +97,7 @@ export RPM_OPT_FLAGS="%{optflags} -fpermissive" %kf5_makeinstall -C build mkdir -p %{buildroot}%{_kf5_servicesdir}/ServiceMenus/ cp %{SOURCE1} %{buildroot}%{_kf5_servicesdir}/ServiceMenus/ +cp %{SOURCE2} %{buildroot}%{_kf5_applicationsdir}/ %suse_update_desktop_file org.kde.krusader.root-mode FileManager Utility %find_lang %{name} %fdupes %{buildroot} @@ -126,6 +117,9 @@ cp %{SOURCE1} %{buildroot}%{_kf5_servicesdir}/ServiceMenus/ %{_kf5_servicesdir}/krarc.protocol %{_kf5_kxmlguidir}/ %{_kf5_mandir}/man1/krusader.1.gz +%dir %{_kf5_mandir}/uk +%dir %{_kf5_mandir}/uk/man1 +%{_kf5_mandir}/*/man1/krusader.1.gz %exclude %{_kf5_htmldir}/*/krusader %dir %{_kf5_appstreamdir} %{_kf5_appstreamdir}/org.kde.krusader.appdata.xml diff --git a/org.kde.krusader.root-mode.desktop b/org.kde.krusader.root-mode.desktop new file mode 100644 index 0000000..602c4b4 --- /dev/null +++ b/org.kde.krusader.root-mode.desktop @@ -0,0 +1,136 @@ +[Desktop Entry] +Name=Krusader - root-mode +Name[bg]=Krusader - администраторски режим +Name[bs]=Krusader - korijenski režim +Name[ca]=Krusader - mode root +Name[ca@valencia]=Krusader - mode root +Name[cs]=Režim Krusaderu s právy roota +Name[da]=Krusader - root-tilstand +Name[de]=Krusader – Systemverwaltungsmodus (root) +Name[el]=Krusader - λειτουργία-root +Name[en_GB]=Krusader - root-mode +Name[es]=Krusader: modo root +Name[et]=Krusader - administraatori õigustes +Name[fi]=Krusader – pääkäyttäjän tila +Name[fr]=Krusader - mode superutilisateur +Name[gl]=Krusader - modo de superusuario +Name[hr]=Krusader – administratorski način (root-mode) +Name[hu]=Krusader - rendszergazda mód +Name[it]=Krusader - modalità root +Name[ko]=Krusader - 루트 모드 +Name[mr]=क्रुसेडर - प्रशासक पद्धत +Name[nb]=Krusader – root-modus +Name[nds]=Krusader - Systeempleegbedrief +Name[nl]=Krusader - root-mode +Name[pa]=ਕੇ-ਰੁਸਡੇਰ - ਰੂਟ ਅਧਿਕਾਰ +Name[pl]=Krusader - tryb-administratora +Name[pt]=Krusader - modo de 'root' +Name[pt_BR]=Krusader - modo root +Name[ro]=Krusader - regim „root” +Name[ru]=Krusader - режим «root» +Name[sk]=Krusader - režim správcu +Name[sl]=Krusader - Skrbniški način +Name[sr]=Крусејдер — корени режим +Name[sr@ijekavian]=Крусејдер — корени режим +Name[sr@ijekavianlatin]=Krusader — koreni režim +Name[sr@latin]=Krusader — koreni režim +Name[sv]=Krusader - Administratörsläge +Name[tr]=Krusader - yönetici kipi +Name[uk]=Krusader — режим адміністратора +Name[x-test]=xxKrusader - root-modexx +Name[zh_CN]=Krusader - 超级用户模式 +Name[zh_TW]=Krusader - root 模式 +Exec=krusader -qwindowtitle %c %u +Icon=krusader_root +Terminal=false +Type=Application +Categories=Qt;KDE;System; +OnlyShowIn=KDE; +X-KDE-SubstituteUID=true +X-KDE-Username=root +Comment=Twin-Panel File Manager with root-privileges +Comment[bg]=Файлов мениджър с два панела и администраторски права +Comment[bs]=Dvostrani menadžer datoteka s korijenskim privilegijama +Comment[ca]=Gestor de fitxers de doble plafó amb privilegis de root +Comment[ca@valencia]=Gestor de fitxers de doble plafó amb privilegis de root +Comment[cs]=Dvoupanelový správce souborů s právy uživatele root +Comment[da]=Filhåntering med dobbeltpanel og root-rettigheder +Comment[de]=Dateiverwaltungsprogramm mit einer zweispaltigen Ansicht mit Systemverwalterrechten +Comment[el]=Διαχειριστής αρχείων διπλού πίνακα με προνόμια διαχειριστή +Comment[en_GB]=Twin-Panel File Manager with root-privileges +Comment[es]=Gestor de archivos de paneles gemelos con privilegios de root +Comment[et]=Kahe paneeliga failihaldur administraatori õigustes +Comment[fi]=Kaksipaneelinen tiedostonhallinta pääkäyttäjän oikeuksilla +Comment[fr]=Gestionnaire de fichiers à deux panneaux avec les privilèges de superutilisateur +Comment[gl]=Xestor de ficheiros de panel dobre con privilexios de superusuario. +Comment[hr]=Upravitelj datoteka s dvojnim panelom i administratorskim pravima +Comment[hu]=Kétpaneles fájlkezelő rendszergazda jogosultságokkal +Comment[it]=Gestore di file a pannello doppio con privilegi di root +Comment[ko]=루트 권한이 있는 이중 패널 파일 관리자 +Comment[mr]=प्रशासकीय परवानगीसह द्वी-पटल फाईल व्यवस्थापक +Comment[nb]=Filbehandler med to paneler, med root-privilegier +Comment[nds]=Dubbelpaneel-Dateipleger mit Systeemplegerverlöven +Comment[nl]=Bestandsbeheerder met twee vensters in root-modus +Comment[pa]=ਰੂਟ-ਅਧਿਕਾਰਾਂ ਦੇ ਨਾਲ ਦੋ-ਬਾਹੀ ਫਾਇਲ ਮੈਨੇਜਰ +Comment[pl]=Zarządzanie plikami w bliźniaczych panelach z uprawnieniami administratora +Comment[pt]=Gestor de ficheiros de painéis duplos com privilégios de 'root' +Comment[pt_BR]=Gerenciador de arquivos de dois painéis com privilégios de root +Comment[ru]=Двухпанельный диспетчер файлов с правами «root» +Comment[sk]=Dvojpanelový správca súborov s právami správcu +Comment[sl]=Upravljalnik datotek z dvema pultoma in skrbniškimi dovoljenji +Comment[sr]=Двопанелни менаџер фајлова са кореним овлашћењима +Comment[sr@ijekavian]=Двопанелни менаџер фајлова са кореним овлашћењима +Comment[sr@ijekavianlatin]=Dvopanelni menadžer fajlova sa korenim ovlašćenjima +Comment[sr@latin]=Dvopanelni menadžer fajlova sa korenim ovlašćenjima +Comment[sv]=Filhanterare med två paneler i administratörsläge +Comment[tr]=Yönetici Kipinde İkiz Panelli Dosya Yönetici +Comment[uk]=Двопанельний менеджер файлів з правами доступу адміністратора +Comment[x-test]=xxTwin-Panel File Manager with root-privilegesxx +Comment[zh_CN]=超级用户模式的双面板文件管理器 +Comment[zh_TW]=雙面板檔案管理員，有 root 權限 +GenericName=File Manager +GenericName[ar]=مدير الملفات +GenericName[ast]=Xestor de ficheros +GenericName[bg]=Файлов мениджър +GenericName[bs]=Menadžer datoteka +GenericName[ca]=Gestor de fitxers +GenericName[ca@valencia]=Gestor de fitxers +GenericName[cs]=Správce souborů +GenericName[da]=Filhåndtering +GenericName[de]=Dateimanager +GenericName[el]=Διαχειριστής αρχείων +GenericName[en_GB]=File Manager +GenericName[eo]=Dosieradministrilo +GenericName[es]=Gestor de archivos +GenericName[et]=Failihaldur +GenericName[fi]=Tiedostonhallinta +GenericName[fr]=Gestionnaire de fichiers +GenericName[ga]=Bainisteoir Comhad +GenericName[gl]=Xestor de ficheiros +GenericName[hr]=Upravitelj datoteka +GenericName[hu]=Fájlkezelő +GenericName[it]=Gestore dei file +GenericName[ko]=파일 관리자 +GenericName[mr]=फाईल व्यवस्थापक +GenericName[nb]=Filbehandler +GenericName[nds]=Dateipleger +GenericName[nl]=Bestandsbeheerder +GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ +GenericName[pl]=Zarządzanie plikami +GenericName[pt]=Gestor de Ficheiros +GenericName[pt_BR]=Gerenciador de arquivos +GenericName[ro]=Gestionar de fișiere +GenericName[ru]=Менеджер файлов +GenericName[sk]=Správca súborov +GenericName[sl]=Upravljalnik datotek +GenericName[sr]=Менаџер фајлова +GenericName[sr@ijekavian]=Менаџер фајлова +GenericName[sr@ijekavianlatin]=Menadžer fajlova +GenericName[sr@latin]=Menadžer fajlova +GenericName[sv]=Filhanterare +GenericName[tr]=Dosya Yönetici +GenericName[ug]=ھۆججەت باشقۇرغۇ +GenericName[uk]=Менеджер файлів +GenericName[x-test]=xxFile Managerxx +GenericName[zh_CN]=文件管理器 +GenericName[zh_TW]=檔案管理員 From 5289aa3c9b168561c965bf5fe57ef725869e14572d52d6de81d8d76689ac28f4 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 17 May 2017 14:09:02 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krusader?expand=0&rev=24 --- krusader.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/krusader.changes b/krusader.changes index ddd5e5b..b6ef661 100644 --- a/krusader.changes +++ b/krusader.changes @@ -77,6 +77,13 @@ Tue Apr 11 18:36:36 UTC 2017 - wbauer@tmo.at are other entries * CHANGED: Duplicate tab settings when duplicating tabs * CHANGED: Some fixes and simpifying startup settings. +- Drop upstream patches: + * krusader-2.5.0-generate-manpage.patch + * 0001-Don-t-hardcode-appdata-location.patch + * Remove-non-archive-mimetypes-from-krarc-archive-mime-type-list.patch + * add-service-actions-to-right-click-popup-menu.patch + * Handle-arrow-key-press-in-brief-view.patch + ------------------------------------------------------------------- Thu Jan 5 21:20:49 UTC 2017 - wbauer@tmo.at From 7877aec8afbc55faa8441583f631abcf54fc74c4ea11a171745e9cf654a9fe9d Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 17 May 2017 14:12:00 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krusader?expand=0&rev=25 --- krusader.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/krusader.changes b/krusader.changes index b6ef661..063071e 100644 --- a/krusader.changes +++ b/krusader.changes @@ -84,7 +84,6 @@ Tue Apr 11 18:36:36 UTC 2017 - wbauer@tmo.at * add-service-actions-to-right-click-popup-menu.patch * Handle-arrow-key-press-in-brief-view.patch - ------------------------------------------------------------------- Thu Jan 5 21:20:49 UTC 2017 - wbauer@tmo.at