diff --git a/README.md b/README.md index 8a04d5f..2c4f1b5 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,5 @@ It provides all the file management features you could possibly want: * file content comparisons * powerful batch renaming and much much more. - It supports the following archive formats: tar, zip, bzip2, gzip, rar, ace, arj and rpm and can handle other KIOSlaves such as smb or fish. diff --git a/krusader-2.0.0-gcc44.patch b/krusader-2.0.0-gcc44.patch deleted file mode 100644 index bd26eb7..0000000 --- a/krusader-2.0.0-gcc44.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp.orig 2009-04-11 21:40:15.000000000 +0200 -+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp 2009-04-20 00:54:02.000000000 +0200 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include - #include "virtualcopyjob.h" diff --git a/krusader-2.0.0-gcc45.patch b/krusader-2.0.0-gcc45.patch deleted file mode 100644 index 8ef2e4f..0000000 --- a/krusader-2.0.0-gcc45.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru krusader-2.0.0.orig//krusader/krslots.cpp krusader-2.0.0/krusader/krslots.cpp ---- krusader-2.0.0.orig//krusader/krslots.cpp 2009-04-11 21:40:25.000000000 +0200 -+++ krusader-2.0.0/krusader/krslots.cpp 2010-12-31 00:33:34.517505884 +0100 -@@ -450,7 +450,7 @@ - KrSearchDialog::SearchDialog->raise(); - KrSearchDialog::SearchDialog->activateWindow(); - } else -- KrSearchDialog::SearchDialog = new KrSearchDialog(); -+ KrSearchDialog::SearchDialog = new KrSearchDialog( QString::null ); - } - - void KRslots::locate() -diff -Nru krusader-2.0.0.orig//krusader/MountMan/kmountmangui.h krusader-2.0.0/krusader/MountMan/kmountmangui.h ---- krusader-2.0.0.orig//krusader/MountMan/kmountmangui.h 2009-04-11 21:40:19.000000000 +0200 -+++ krusader-2.0.0/krusader/MountMan/kmountmangui.h 2010-12-31 00:34:01.519436467 +0100 -@@ -112,7 +112,7 @@ - ///////////////////////////////////////////////////////////////// - class fsData { - public: -- fsData() : Name( 0 ), Type( 0 ), MntPoint( 0 ), TotalBlks( 0 ), -+ fsData() : Name( QString::null ), Type( QString::null ), MntPoint( QString::null ), TotalBlks( 0 ), - FreeBlks( 0 ), Mounted( false ) {} - - // get information diff --git a/krusader.spec b/krusader.spec index 0e4cf9e..62c89a2 100644 --- a/krusader.spec +++ b/krusader.spec @@ -1,6 +1,6 @@ %define pkgver %(echo %version | tr _ -) Name: krusader -Version: 2.8.1 +Version: 2.9.0 Release: 1mamba Summary: An advanced twin panel (commander style) file manager for KDE Group: Graphical Desktop/Applications/Utilities @@ -9,43 +9,52 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://krusader.org/ Source: http://download.kde.org/stable/krusader/%{version}/krusader-%{version}.tar.xz -#Source: http://downloads.sourceforge.net/project/krusader/krusader/%{pkgver}/krusader-%{pkgver}.tar.bz2 -Patch0: %{name}-2.0.0-gcc44.patch -Patch1: %{name}-2.0.0-gcc45.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libQt6Concurrent +BuildRequires: libQt6Core +BuildRequires: libQt6DBus +BuildRequires: libQt6Gui +BuildRequires: libQt6Network +BuildRequires: libQt6PrintSupport +BuildRequires: libQt6Widgets +BuildRequires: libQt6Xml BuildRequires: libX11-devel BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: libgcc -BuildRequires: libkarchive-devel -BuildRequires: libkauth-devel -BuildRequires: libkbookmarks-devel -BuildRequires: libkcodecs-devel -BuildRequires: libkcompletion-devel -BuildRequires: libkconfig-devel -BuildRequires: libkconfigwidgets-devel -BuildRequires: libkcoreaddons-devel -BuildRequires: libkguiaddons-devel -BuildRequires: libki18n-devel -BuildRequires: libkiconthemes-devel -BuildRequires: libkio-devel -BuildRequires: libkitemviews-devel -BuildRequires: libkjobwidgets-devel -BuildRequires: libknotifications-devel -BuildRequires: libkparts-devel -BuildRequires: libkservice-devel -BuildRequires: libktextwidgets-devel -BuildRequires: libkwallet-devel -BuildRequires: libkwidgetsaddons-devel -BuildRequires: libkwindowsystem-devel -BuildRequires: libkxmlgui-devel -BuildRequires: libsolid-devel -BuildRequires: libsonnet-devel +BuildRequires: libglvnd-devel +BuildRequires: libkf6-karchive-devel +BuildRequires: libkf6-kbookmarks-devel +BuildRequires: libkf6-kcodecs-devel +BuildRequires: libkf6-kcolorscheme-devel +BuildRequires: libkf6-kcompletion-devel +BuildRequires: libkf6-kconfig-devel +BuildRequires: libkf6-kconfigwidgets-devel +BuildRequires: libkf6-kcoreaddons-devel +BuildRequires: libkf6-kcrash-devel +BuildRequires: libkf6-kglobalaccel-devel +BuildRequires: libkf6-kguiaddons-devel +BuildRequires: libkf6-ki18n-devel +BuildRequires: libkf6-kiconthemes-devel +BuildRequires: libkf6-kio-devel +BuildRequires: libkf6-kitemviews-devel +BuildRequires: libkf6-kjobwidgets-devel +BuildRequires: libkf6-knotifications-devel +BuildRequires: libkf6-kparts-devel +BuildRequires: libkf6-kservice-devel +BuildRequires: libkf6-kstatusnotifieritem-devel +BuildRequires: libkf6-ktextwidgets-devel +BuildRequires: libkf6-kwallet-devel +BuildRequires: libkf6-kwidgetsaddons-devel +BuildRequires: libkf6-kwindowsystem-devel +BuildRequires: libkf6-kxmlgui-devel +BuildRequires: libkf6-solid-devel +BuildRequires: libkf6-sonnet-devel BuildRequires: libstdc++6-devel BuildRequires: libz-devel -BuildRequires: qt5-qtbase-devel +BuildRequires: qt6-qt5compat-devel ## AUTOBUILDREQ-END BuildRequires: gettext-devel BuildRequires: libxml2-utils @@ -81,33 +90,30 @@ It provides all the file management features you could possibly want: * file content comparisons * powerful batch renaming and much much more. - It supports the following archive formats: tar, zip, bzip2, gzip, rar, ace, arj and rpm and can handle other KIOSlaves such as smb or fish. -%debug_package - %prep %setup -q -n %{name}-%{pkgver} -#%patch0 -p1 -#%patch1 -p1 %build -%cmake_kde5 -d build -%make +%cmake_kf6 + +%cmake_build %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%makeinstall -C build +%cmake_install -%find_lang %{name}5_qt --with-qt --with-man --all-name || touch %{name}5_qt.lang +%find_lang %{name} --with-qt --with-man --all-name || touch %{name}.lang %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%files -f %{name}5_qt.lang +%files -f %{name}.lang %defattr(-,root,root) %{_kde5_bindir}/krusader -%{_libdir}/qt5/plugins/kf5/kio/kio_*.so +%{_kf6_plugindir}/kio/kio_iso.so +%{_kf6_plugindir}/kio/kio_krarc.so %{_datadir}/metainfo/org.kde.krusader.appdata.xml %{_datadir}/applications/org.kde.krusader*.desktop %dir %{_datadir}/kxmlgui5/krusader @@ -120,6 +126,9 @@ It supports the following archive formats: tar, zip, bzip2, gzip, rar, ace, arj %doc AUTHORS LICENSES %changelog +* Thu Jan 02 2025 Automatic Build System 2.9.0-1mamba +- automatic version update by autodist + * Tue Mar 12 2024 Automatic Build System 2.8.1-1mamba - automatic version update by autodist