- up to 2.5.0 (switched to Qt5)

diff --git a/krusader-desktop.patch b/krusader-desktop.patch
deleted file mode 100644 (file)
index 08ebeb7..0000000
--- a/krusader-desktop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- krusader-2.0.0/krusader/krusader_root-mode.desktop.orig    2008-12-27 23:32:20.000000000 +0100
-+++ krusader-2.0.0/krusader/krusader_root-mode.desktop 2008-12-27 23:35:17.000000000 +0100
-@@ -4,6 +4,7 @@
- Name[de]=Krusader - root-Modus
- Name[cs]=Krusader s právy roota
- Name[lt]=Krusader – root režimas
-+Name[pl]=Krusader – tryb administratora
- Exec=krusader -caption "%c" %i %m  
- Icon=krusader_root.png
- Terminal=false
-@@ -17,6 +18,7 @@
- Comment[de]=Zwei-Fenster Dateimanager (Systemverwaltungsmodus)
- Comment[cs]=Dvojpanelový správce souborů s právy Roota
- Comment[lt]=Dviejų skydelių failų tvarkyklė su root teisėmis
-+Comment[pl]=Dwupanelowy zarządca plików - tryb administratora
- GenericName=File Manager
- GenericName[af]=Lêer Bestuurder
- GenericName[ar]=مدير الملفات

diff --git a/krusader-headers.patch b/krusader-headers.patch
deleted file mode 100644 (file)
index 91eae48..0000000
--- a/krusader-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp~     2009-04-11 21:40:15.000000000 +0200
-+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp      2010-02-22 12:34:55.554124493 +0100
-@@ -41,6 +41,7 @@
- #include <klocale.h>
- #include "virtualcopyjob.h"
- #include <QTextDocument>
-+#include <stdio.h>
- 
- class JobStartEvent : public QEvent {
- public:

diff --git a/krusader.spec b/krusader.spec
index 13b42284011a311b9b6d75f54c3512c3869977f8..a85206eea3485c370f6048fac82c7a3c3a744a33 100644 (file)
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,4 +1,7 @@
 #
+# TODO:
+# - review BRs
+#
 # Conditional build:
 %bcond_without libkonq         # importing the right click menu of konqueror
 %bcond_with    libkjsembed     # with libkjsembed
@@ -7,16 +10,17 @@
 Summary:       Krusader is a filemanager for KDE
 Summary(pl.UTF-8):     Krusader jest zarządcą plików dla KDE
 Name:          krusader
-Version:       2.0.0
-Release:       2
+Version:       2.5.0
+Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://downloads.sourceforge.net/krusader/%{name}-%{version}.tar.gz
-# Source0-md5: f80f500a136d549739ad5d4bcab7fa5f
-Patch0:                %{name}-desktop.patch
-Patch1:                %{name}-headers.patch
-URL:           http://www.krusader.org
+Source0:       http://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 5074c7c8dcd7fa8c8509f472bc2e0815
+URL:           http://www.krusader.org/
 BuildRequires: Qt3Support-devel
+BuildRequires: Qt5DBus-devel
+BuildRequires: Qt5Network-devel
+BuildRequires: Qt5Xml-devel
 BuildRequires: QtDBus-devel
 BuildRequires: QtSvg-devel
 BuildRequires: automoc4
@@ -25,9 +29,35 @@ BuildRequires:       gettext-tools
 %{?with_libkonq:BuildRequires: kde4-kdebase-devel}
 %{?with_libkjsembed:BuildRequires:     kde4-kdebindings-kjsembed-devel}
 BuildRequires: kde4-kdelibs-devel
+BuildRequires: kf5-extra-cmake-modules
+BuildRequires: kf5-karchive-devel
+BuildRequires: kf5-kauth-devel
+BuildRequires: kf5-kbookmarks-devel
+BuildRequires: kf5-kcodecs-devel
+BuildRequires: kf5-kcompletion-devel
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kdoctools-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kitemviews-devel
+BuildRequires: kf5-kjobwidgets-devel
+BuildRequires: kf5-knotifications-devel
+BuildRequires: kf5-kparts-devel
+BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-ktextwidgets-devel
+BuildRequires: kf5-kwallet-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: kf5-solid-devel
+BuildRequires: kf5-sonnet-devel
 BuildRequires: phonon-devel
-BuildRequires: qt4-build
-BuildRequires: qt4-qmake
+BuildRequires: qt5-build
+BuildRequires: qt5-qmake
 BuildRequires: rpmbuild(macros) >= 1.129
 BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
@@ -73,8 +103,6 @@ wypróbować.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
@@ -102,16 +130,21 @@ install -d $RPM_BUILD_ROOT%{_desktopdir}
 # locolor icons are deprecated (see kde .spec-s)
 rm -f $RPM_BUILD_ROOT%{_iconsdir}/locolor/*/apps/*.png
 
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/HTML/pt_BR $RPM_BUILD_ROOT%{_docdir}/HTML/pt
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog FAQ README doc/actions_tutorial.txt
+%doc AUTHORS ChangeLog FAQ README doc-extras/actions_tutorial.txt
 %attr(755,root,root) %{_bindir}/krusader
-%attr(755,root,root) %{_libdir}/kde4/*.so
-%{_datadir}/apps/krusader
-%{_datadir}/config/kio_isorc
-%{_datadir}/kde4/services/*.protocol
-%{_desktopdir}/kde4/*.desktop
+%attr(755,root,root) %{_libdir}/qt5/plugins/*.so
+%{_sysconfdir}/xdg/kio_isorc
+%{_datadir}/appdata/org.kde.krusader.appdata.xml
+%{_datadir}/krusader
+%{_datadir}/kservices5/*.protocol
+%{_datadir}/kxmlgui5/krusader
+%{_desktopdir}/*.desktop
+%{_docdir}/HTML/*/krusader
 %{_iconsdir}/hicolor/*/*/*