OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krusader?expand=0&rev=6

bug309159.patch

@@ -1,66 +0,0 @@
-From: Jan Lepper <jan_lepper@gmx.de>
-Date: Tue, 30 Oct 2012 21:15:43 +0000
-Subject: FIXED: [ 309159 ] Crash in video files preview on F3
-X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=770fa41c1f8e76d91eb981ee56d972efe10dc667
----
-FIXED: [ 309159 ] Crash in video files preview on F3
-remove unnecessary code that possibly
-- causes infinite recursion
-- uses an invalid KUrl object
-BUG: 309159
----
-
-
---- a/krusader/KViewer/krviewer.cpp
-+++ b/krusader/KViewer/krviewer.cpp
-@@ -534,11 +534,6 @@
-     if (!pvb->part())
-         return;
- 
--    //FIXME this belongs to PanelViewer
--    if (!pvb->part()->url().equals(pvb->url(), KUrl::CompareWithoutTrailingSlash)) {
--        pvb->setUrl(pvb->part()->url());
--    }
--
-     int ndx = tabBar.indexOf(pvb);
-     tabBar.setTabText(ndx, makeTabText(pvb));
-     tabBar.setTabIcon(ndx, makeTabIcon(pvb));
-
---- a/krusader/KViewer/panelviewer.cpp
-+++ b/krusader/KViewer/panelviewer.cpp
-@@ -214,9 +214,9 @@
- 
- KParts::ReadOnlyPart* PanelViewer::openUrl(const KUrl &url, KrViewer::Mode mode)
- {
--    emit urlChanged(this, url);
-     closeUrl();
-     curl = url;
-+    emit urlChanged(this, url);
- 
-     KMimeType::Ptr mt = KMimeType::findByUrl(url);
-     QString mimetype = mt->name();
-@@ -328,9 +328,9 @@
- 
- KParts::ReadOnlyPart* PanelEditor::openUrl(const KUrl &url, KrViewer::Mode mode)
- {
--    emit urlChanged(this, url);
-     closeUrl();
-     curl = url;
-+    emit urlChanged(this, url);
- 
-     KFileItem item = readFileInfo(url);
-     KIO::filesize_t fileSize = item.isNull() ? 0 : item.size();
-
---- a/krusader/KViewer/panelviewer.h
-+++ b/krusader/KViewer/panelviewer.h
-@@ -41,9 +41,6 @@
-     virtual ~PanelViewerBase();
-     inline KUrl url() const {
-         return curl;
--    }
--    inline void setUrl(KUrl url) {
--        emit urlChanged(this, url); curl = url;
-     }
-     inline KParts::ReadOnlyPart* part() const {
-         return cpart;
-

krusader-2.4.0-beta3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca43ddeef91e2821142b723d13c0be4bf0d138a9718cccd914cecb675cc97dae
-size 4305463

krusader-2.5.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb9f4b237378fd5d86d5c0202b9d714f3d8dfe549ba9e7926f6f9de60b5088d7
+size 2704584

krusader.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package krusader
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -16,28 +16,44 @@
 #
 
 
-%define tar_version 2.4.0-beta3
 Name:           krusader
-Version:        2.4.0~beta3
+Version:        2.5.0
 Release:        0
 Summary:        A File Manager
 License:        GPL-2.0+
 Group:          Productivity/File utilities
 Url:            http://krusader.sourceforge.net/
-Source:         %{name}-%{tar_version}.tar.bz2
+Source:         http://download.kde.org/stable/krusader/%{version}/%{name}-%{version}.tar.xz
 Source1:        krusader_browse_iso.desktop
 # PATCH-FIX-OPENSUSE krusader-2.4.0-beta2-generate-manpage.patch -- generate manpage
 Patch0:         krusader-2.4.0-beta2-generate-manpage.patch
-# PATCH-FIX-UPSTREAM bug309159.patch [kde#309159]
+BuildRequires:  extra-cmake-modules
-Patch1:         bug309159.patch
 BuildRequires:  fdupes
-BuildRequires:  libkde4-devel
+BuildRequires:  fdupes
-BuildRequires:  libkonq-devel
+BuildRequires:  gettext-devel
+BuildRequires:  karchive-devel
+BuildRequires:  kconfig-devel
+BuildRequires:  kdelibs4support-devel
+BuildRequires:  kdoctools-devel
+BuildRequires:  kf5-filesystem
+BuildRequires:  khtml-devel
+BuildRequires:  kio-devel
+BuildRequires:  kparts-devel
+BuildRequires:  kwallet-devel
+BuildRequires:  python-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Script)
+BuildRequires:  pkgconfig(Qt5Sql)
+BuildRequires:  pkgconfig(Qt5Test)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5Xml)
 Requires:       kio_iso = %{version}
 Requires:       libktexteditor
 Suggests:       %{name}-doc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{kde4_runtime_requires}
 
 %description
 An advanced twin panel (commander style) file manager for KDE.
@@ -47,7 +63,6 @@ Summary:        KIO slave to access ISO images
 Group:          System/GUI/KDE
 Provides:       kde4-kio_iso = 1.80.99
 Obsoletes:      kde4-kio_iso < 1.80.99
-%{kde4_runtime_requires}
 
 %description -n kio_iso
 KIO slave to access ISO images like zip- or tar.gz-archives in your
@@ -63,21 +78,17 @@ An advanced twin panel (commander style) file manager for KDE.
 %prep
 %setup -q -n %{name}-%{tar_version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 export RPM_OPT_FLAGS="%{optflags} -fpermissive"
-%cmake_kde4 -d build
+%cmake_kf5 -d build
 %make_jobs
 
 %install
-pushd build
+%kf5_makeinstall -C build
-%make_install
+mkdir -p %{buildroot}%{_kf5_servicesdir}/ServiceMenus/
-popd
+cp %{SOURCE1} %{buildroot}%{_kf5_servicesdir}/ServiceMenus/
-mkdir -p %{buildroot}%{_kde4_servicesdir}/ServiceMenus/
+%suse_update_desktop_file org.kde.krusader.root-mode FileManager Utility
-cp %{SOURCE1} %{buildroot}%{_kde4_servicesdir}/ServiceMenus/
-%suse_update_desktop_file krusader_root-mode FileManager Utility
-%kde_post_install
 %find_lang %{name}
 %fdupes %{buildroot}
 
@@ -88,28 +99,28 @@ cp %{SOURCE1} %{buildroot}%{_kde4_servicesdir}/ServiceMenus/
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README AUTHORS COPYING ChangeLog TODO SVNNEWS
-%{_kde4_applicationsdir}/krusader*.desktop
+%{_kf5_applicationsdir}/krusader*.desktop
-%{_kde4_appsdir}/krusader
+%{_kf5_appsdir}/krusader
-%{_kde4_bindir}/krusader
+%{_kf5_bindir}/krusader
-%{_kde4_iconsdir}/??color/*/apps/krusader*.png
+%{_kf5_iconsdir}/??color/*/apps/krusader*.png
-%{_kde4_modules}/kio_krarc.so
+%{_kf5_plugindir}/kio_krarc.so
-%{_kde4_servicesdir}/krarc.protocol
+%{_kf5_servicesdir}/krarc.protocol
-%{_kde4_mandir}/man1/krusader.1.gz
+%{_kf5_mandir}/man1/krusader.1.gz
-%exclude %{_kde4_htmldir}/*/krusader
+%exclude %{_kf5_htmldir}/*/krusader
 
 %files -n kio_iso
 %defattr(-,root,root)
-%config %{_kde4_configdir}/kio_isorc
+%config %{_kf5_configdir}/kio_isorc
-%{_kde4_modules}/kio_iso.so*
+%{_kf5_plugindir}/kio_iso.so*
-%{_kde4_servicesdir}/iso.protocol
+%{_kf5_servicesdir}/iso.protocol
-%{_kde4_servicesdir}/ServiceMenus/krusader_browse_iso.desktop
+%{_kf5_servicesdir}/ServiceMenus/krusader_browse_iso.desktop
 
 %files doc
 %defattr(-,root,root)
-%doc %lang(en) %{_kde4_htmldir}/en/krusader
+%doc %lang(en) %{_kf5_htmldir}/en/krusader
-%doc %lang(uk) %{_kde4_htmldir}/uk/krusader
+%doc %lang(uk) %{_kf5_htmldir}/uk/krusader
-%doc %lang(sv) %{_kde4_htmldir}/sv/krusader
+%doc %lang(sv) %{_kf5_htmldir}/sv/krusader
-%doc %lang(pt) %{_kde4_htmldir}/pt/krusader
+%doc %lang(pt) %{_kf5_htmldir}/pt/krusader
-%doc %lang(pt_BR) %{_kde4_htmldir}/pt_BR/krusader
+%doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR/krusader
 
 %changelog