Hello community, here is the log from the commit of package krusader for openSUSE:Factory checked in at 2016-10-24 14:44:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krusader (Old) and /work/SRC/openSUSE:Factory/.krusader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krusader" Changes: -------- --- /work/SRC/openSUSE:Factory/krusader/krusader.changes 2015-05-27 12:49:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krusader.new/krusader.changes 2016-10-24 14:44:54.000000000 +0200 @@ -1,0 +2,51 @@ +Sun Oct 23 17:15:55 UTC 2016 - [email protected] + +- Update to 2.5.0 + * Added actions: Select files with the same name / extension + * Changed disabled build of synchronizer by default, since it + is unmaintained - build togglable with cmake variable + -DENABLE_SYNCHRONIZER=true|false + * Fixed (kde#143927) file search: "s" accelerator is doubled - + new shortcut for "Search in" is ALT+h + * Fixed (kde#308386) Duplicate shortcut on Search window - + new shortcut for "Remote content search" is ALT+n + * Fixed (kde#206926) Search doesn't work in sftp session + (it returns too many results) + * Fixed (kde#269542) Krusader search - Containing text + still used when disabled + * Fixed (kde#324737) symlinks with a target path length + of over 255 do not work + * Fixed (kde#189943) toolbar position settings are not remembered + * Fixed (kde#316031) crash when loading previews + * Fixed (kde#238672) When saving checksums fails, + they are lost. No 2nd chance to save elsewhere. + * Fixed (kde#315764) "application/x-source-rpm" isn't linked + to krarc protocol by default + * Fixed (kde#294816) Krusader needs to restart to apply + new color scheme to panel + * Fixed (kde#308727) external editor command isn't properly parsed + * Fixed (kde#304233) empty main view on startup + * Fixed (kde#315856) main view splitter sizes are not restored + * Fixed (kde#248691) incorrect layout / wrong buttons + in queue manager + * Fixed (kde#315357) krarc silently fails to display + contents of some zip files containing paths with "." as a + path component are still not handled, but now krarc reports an + error instead silently failing + * Fixed (kde#310722) viewer crash when opening file + * Fixed search result view always displays owner and group as "root" + (may not work for remote search) + * Fixed (kde#217711) directory chooser dialog does not allow + to choose a directory + * Fixed (kde#309119) Wrong "New directory" dialog behavior: + can't clear all typed text + * Fixed (kde#309159) Crash in video files preview on F3 + * Fixed (kde#310191) krusader still installs locolor icons + * Fixed (kde#317510 ] icon-size-and-directory-name-mismatch +- Package ported to KF5, changed all the BuildRequires to KF5 ones +- Swap krusader-2.4.0-beta2-generate-manpage.patch for + krusader-2.5.0-generate-manpage.patch +- Drop upstreamed bug309159.patch +- Added 0001-Don-t-hardcode-appdata-location.patch + +------------------------------------------------------------------- Old: ---- bug309159.patch krusader-2.4.0-beta2-generate-manpage.patch krusader-2.4.0-beta3.tar.bz2 New: ---- 0001-Don-t-hardcode-appdata-location.patch krusader-2.5.0-generate-manpage.patch krusader-2.5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krusader.spec ++++++ --- /var/tmp/diff_new_pack.9L7AIT/_old 2016-10-24 14:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.9L7AIT/_new 2016-10-24 14:44:55.000000000 +0200 @@ -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,53 @@ # -%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 +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.4.0-beta2-generate-manpage.patch -- generate manpage -Patch0: krusader-2.4.0-beta2-generate-manpage.patch -# PATCH-FIX-UPSTREAM bug309159.patch [kde#309159] -Patch1: bug309159.patch +# 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 +BuildRequires: extra-cmake-modules >= 1.1.0 BuildRequires: fdupes -BuildRequires: libkde4-devel -BuildRequires: libkonq-devel +BuildRequires: libacl-devel +BuildRequires: libattr-devel +BuildRequires: update-desktop-files +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5Bookmarks) +BuildRequires: cmake(KF5Codecs) +BuildRequires: cmake(KF5Completion) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5ItemViews) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5Solid) +BuildRequires: cmake(KF5TextWidgets) +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 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 +72,6 @@ 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 @@ -61,23 +85,20 @@ An advanced twin panel (commander style) file manager for KDE. %prep -%setup -q -n %{name}-%{tar_version} +%setup -q -n %{name}-%{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 -%make_install -popd -mkdir -p %{buildroot}%{_kde4_servicesdir}/ServiceMenus/ -cp %{SOURCE1} %{buildroot}%{_kde4_servicesdir}/ServiceMenus/ -%suse_update_desktop_file krusader_root-mode FileManager Utility -%kde_post_install +%kf5_makeinstall -C build +mkdir -p %{buildroot}%{_kf5_servicesdir}/ServiceMenus/ +cp %{SOURCE1} %{buildroot}%{_kf5_servicesdir}/ServiceMenus/ +%suse_update_desktop_file org.kde.krusader.root-mode FileManager Utility %find_lang %{name} %fdupes %{buildroot} @@ -88,28 +109,32 @@ %files -f %{name}.lang %defattr(-,root,root) %doc README AUTHORS COPYING ChangeLog TODO SVNNEWS -%{_kde4_applicationsdir}/krusader*.desktop -%{_kde4_appsdir}/krusader -%{_kde4_bindir}/krusader -%{_kde4_iconsdir}/??color/*/apps/krusader*.png -%{_kde4_modules}/kio_krarc.so -%{_kde4_servicesdir}/krarc.protocol -%{_kde4_mandir}/man1/krusader.1.gz -%exclude %{_kde4_htmldir}/*/krusader +%{_kf5_applicationsdir}/org.kde.krusader*.desktop +%{_kf5_appsdir}/krusader +%{_kf5_bindir}/krusader +%{_kf5_iconsdir}/??color/*/apps/krusader*.png +%{_kf5_plugindir}/kio_krarc.so +%{_kf5_servicesdir}/krarc.protocol +%{_kf5_kxmlguidir}/ +%{_kf5_mandir}/man1/krusader.1.gz +%exclude %{_kf5_htmldir}/*/krusader +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.krusader.appdata.xml %files -n kio_iso %defattr(-,root,root) -%config %{_kde4_configdir}/kio_isorc -%{_kde4_modules}/kio_iso.so* -%{_kde4_servicesdir}/iso.protocol -%{_kde4_servicesdir}/ServiceMenus/krusader_browse_iso.desktop +%config %{_kf5_configdir}/kio_isorc +%{_kf5_plugindir}/kio_iso.so* +%{_kf5_servicesdir}/iso.protocol +%dir %{_kf5_servicesdir}/ServiceMenus +%{_kf5_servicesdir}/ServiceMenus/krusader_browse_iso.desktop %files doc %defattr(-,root,root) -%doc %lang(en) %{_kde4_htmldir}/en/krusader -%doc %lang(uk) %{_kde4_htmldir}/uk/krusader -%doc %lang(sv) %{_kde4_htmldir}/sv/krusader -%doc %lang(pt) %{_kde4_htmldir}/pt/krusader -%doc %lang(pt_BR) %{_kde4_htmldir}/pt_BR/krusader +%doc %lang(en) %{_kf5_htmldir}/en/krusader +%doc %lang(uk) %{_kf5_htmldir}/uk/krusader +%doc %lang(sv) %{_kf5_htmldir}/sv/krusader +%dir %{_kf5_htmldir}/pt_BR +%doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR/krusader %changelog ++++++ 0001-Don-t-hardcode-appdata-location.patch ++++++ >From 84bf36bf7f9f7cbbc5883c7aba405cb5b5d32460 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> 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 ++++++ krusader-2.4.0-beta2-generate-manpage.patch -> krusader-2.5.0-generate-manpage.patch ++++++ --- /work/SRC/openSUSE:Factory/krusader/krusader-2.4.0-beta2-generate-manpage.patch 2012-11-13 17:07:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krusader.new/krusader-2.5.0-generate-manpage.patch 2016-10-24 14:44:54.000000000 +0200 @@ -1,8 +1,9 @@ -diff -up krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt.generate-manpage krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt ---- krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt.generate-manpage 2012-10-15 08:51:50.570757518 +0200 -+++ krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt 2012-10-15 08:52:56.522420929 +0200 -@@ -1 +1,3 @@ - kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR krusader ) -+kde4_create_manpage(man-krusader.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) -+ +--- 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})
