Hello community, here is the log from the commit of package kio for openSUSE:Factory checked in at 2015-04-13 20:26:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kio (Old) and /work/SRC/openSUSE:Factory/.kio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio" Changes: -------- --- /work/SRC/openSUSE:Factory/kio/kio.changes 2015-03-16 09:33:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kio.new/kio.changes 2015-04-13 20:26:39.000000000 +0200 @@ -1,0 +2,24 @@ +Sat Apr 4 14:40:53 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.9.0 + * Enable KPropertiesDialog to show free space information of + remote file systems as well (e.g. smb) + * Fix KUrlNavigator with high DPI pixmaps + * Make KFileItemDelegate handle non default devicePixelRatio + in animations + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php +- Split the core modules/daemons/libraries into core subpackage; + based on upstream KIOCORE_ONLY build option, which only concerns + the buildsystem, not the code (i.e. no ifdefs) +- Add kio_help-fallback-to-kde4-docs.patch: allow kio_help to see + into kde4 documentation + +------------------------------------------------------------------- +Mon Mar 16 11:58:09 UTC 2015 - hrvoje.sen...@gmail.com + +- Add missing requires to devel subpackage: kcoreaddons-devel, + kconfig-devel and kitemviews-devel +- Drop unneeded kcrash-devel BuildRequires + +------------------------------------------------------------------- Old: ---- kio-5.8.0.tar.xz New: ---- kio-5.9.0.tar.xz kio_help-fallback-to-kde4-docs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio.spec ++++++ --- /var/tmp/diff_new_pack.hgfZoH/_old 2015-04-13 20:26:40.000000000 +0200 +++ /var/tmp/diff_new_pack.hgfZoH/_new 2015-04-13 20:26:40.000000000 +0200 @@ -16,39 +16,39 @@ # -%define _tar_path 5.8 +%bcond_without lang +%define _tar_path 5.9 Name: kio -Version: %{_tar_path}.0 +Version: 5.9.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: karchive-devel >= %{kf5_version} -BuildRequires: kbookmarks-devel >= %{kf5_version} -BuildRequires: kcompletion-devel >= %{kf5_version} -BuildRequires: kconfigwidgets-devel >= %{kf5_version} -BuildRequires: kcoreaddons-devel >= %{kf5_version} -BuildRequires: kcrash-devel >= %{kf5_version} -BuildRequires: kdbusaddons-devel >= %{kf5_version} -BuildRequires: kdoctools-devel >= %{kf5_version} +BuildRequires: karchive-devel >= %{_tar_path} +BuildRequires: kbookmarks-devel >= %{_tar_path} +BuildRequires: kcompletion-devel >= %{_tar_path} +BuildRequires: kconfigwidgets-devel >= %{_tar_path} +BuildRequires: kcoreaddons-devel >= %{_tar_path} +BuildRequires: kdbusaddons-devel >= %{_tar_path} +BuildRequires: kdoctools-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: kguiaddons-devel >= %{kf5_version} -BuildRequires: ki18n-devel >= %{kf5_version} -BuildRequires: kiconthemes-devel >= %{kf5_version} -BuildRequires: kitemviews-devel >= %{kf5_version} -BuildRequires: kjobwidgets-devel >= %{kf5_version} -BuildRequires: knotifications-devel >= %{kf5_version} +BuildRequires: kguiaddons-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_tar_path} +BuildRequires: kiconthemes-devel >= %{_tar_path} +BuildRequires: kitemviews-devel >= %{_tar_path} +BuildRequires: kjobwidgets-devel >= %{_tar_path} +BuildRequires: knotifications-devel >= %{_tar_path} BuildRequires: krb5-devel -BuildRequires: kservice-devel >= %{kf5_version} -BuildRequires: ktextwidgets-devel >= %{kf5_version} -BuildRequires: kwallet-devel >= %{kf5_version} -BuildRequires: kwidgetsaddons-devel >= %{kf5_version} -BuildRequires: kwindowsystem-devel >= %{kf5_version} -BuildRequires: kxmlgui-devel >= %{kf5_version} +BuildRequires: kservice-devel >= %{_tar_path} +BuildRequires: ktextwidgets-devel >= %{_tar_path} +BuildRequires: kwallet-devel >= %{_tar_path} +BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: kxmlgui-devel >= %{_tar_path} BuildRequires: libacl-devel BuildRequires: libattr-devel -BuildRequires: solid-devel >= %{kf5_version} +BuildRequires: solid-devel >= %{_tar_path} BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 @@ -60,7 +60,10 @@ BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(x11) +Requires: %{name}-core = %{version} +%if %{with lang} Recommends: %{name}-lang = %{version} +%endif Recommends: kio-extras5 # KIO/FileDialog uses klauncher directly, but we can't add Requires, as that would introduce dep cycle Recommends: kinit @@ -70,6 +73,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 +Patch0: kio_help-fallback-to-kde4-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,17 +82,33 @@ will ever need. In fact, the KDE file manager (Dolphin) and the KDE file dialog also uses this to provide its network-enabled file management. +%package core +Summary: Network transparent access to files and data +Group: System/GUI/KDE +# core subpackage created with 5.9.0 +Conflicts: kio <= 5.8.0 + +%description core +This framework implements almost all the file management functions you +will ever need. In fact, the KDE file manager (Dolphin) and the KDE +file dialog also uses this to provide its network-enabled file management. +KIO core libraries, ioslave and daemons. + %package devel Summary: Network transparent access to files and data Group: Development/Libraries/KDE Requires: %{name} = %{version} +Requires: %{name}-core = %{version} Requires: extra-cmake-modules -Requires: kbookmarks-devel >= %{kf5_version} -Requires: kcompletion-devel >= %{kf5_version} -Requires: kjobwidgets-devel >= %{kf5_version} -Requires: kservice-devel >= %{kf5_version} -Requires: kxmlgui-devel >= %{kf5_version} -Requires: solid-devel >= %{kf5_version} +Requires: kbookmarks-devel >= %{_tar_path} +Requires: kcompletion-devel >= %{_tar_path} +Requires: kconfig-devel >= %{_tar_path} +Requires: kcoreaddons-devel >= %{_tar_path} +Requires: kitemviews-devel >= %{_tar_path} +Requires: kjobwidgets-devel >= %{_tar_path} +Requires: kservice-devel >= %{_tar_path} +Requires: kxmlgui-devel >= %{_tar_path} +Requires: solid-devel >= %{_tar_path} Requires: pkgconfig(Qt5Network) >= 5.2.0 %description devel @@ -99,6 +120,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build @@ -106,48 +128,109 @@ %install %kf5_makeinstall -C build - %fdupes -s %{buildroot} + %fdupes %{buildroot} + +%if %{with lang} +%find_lang %{name}5 %{name}5.lang +echo "%doc %lang(it) %{_kf5_mandir}/it" >>%{name}5.lang +echo "%doc %lang(nl) %{_kf5_mandir}/nl" >>%{name}5.lang +echo "%doc %lang(pt_BR) %{_kf5_mandir}/pt_BR" >>%{name}5.lang +echo "%doc %lang(sv) %{_kf5_mandir}/sv" >>%{name}5.lang +echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang +%endif + +%post core -p /sbin/ldconfig - %find_lang %{name}5 %{name}5.lang +%postun core -p /sbin/ldconfig %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%if %{with lang} %files lang -f %{name}5.lang -%defattr(-,root,root) -%doc %lang(it) %{_kf5_mandir}/it -%doc %lang(nl) %{_kf5_mandir}/nl -%doc %lang(pt_BR) %{_kf5_mandir}/pt_BR -%doc %lang(sv) %{_kf5_mandir}/sv -%doc %lang(uk) %{_kf5_mandir}/uk +%endif + +%files core +%doc COPYING* README* +%{_kf5_libdir}/libKF5KIOCore.so.* +%{_kf5_configdir}/accept-languages.codes +%{_kf5_libdir}/libKF5KIONTLM.so.* +%dir %{_kf5_plugindir}/kf5 +%dir %{_kf5_plugindir}/kf5/kio +%{_kf5_plugindir}/kf5/kio/file.so +%{_kf5_servicesdir}/file.protocol +%{_kf5_plugindir}/kf5/kio/ftp.so +%{_kf5_servicesdir}/ftp.protocol +%{_kf5_plugindir}/kf5/kio/help.so +%{_kf5_plugindir}/kf5/kio/ghelp.so +%{_kf5_servicesdir}/help.protocol +%{_kf5_servicesdir}/ghelp.protocol +%{_kf5_libexecdir}/kio_http_cache_cleaner +%{_kf5_plugindir}/kf5/kio/http.so +%{_kf5_servicesdir}/http_cache_cleaner.desktop +%{_kf5_servicesdir}/http.protocol +%{_kf5_servicesdir}/https.protocol +%{_kf5_servicesdir}/webdav.protocol +%{_kf5_servicesdir}/webdavs.protocol +%{_kf5_bindir}/kmailservice5 +%{_kf5_applicationsdir}/kmailservice5.desktop +%{_kf5_servicesdir}/data.protocol +%{_kf5_servicesdir}/rtsp.protocol +%{_kf5_servicesdir}/mms.protocol +%{_kf5_servicesdir}/mmst.protocol +%{_kf5_servicesdir}/mmsu.protocol +%{_kf5_servicesdir}/pnm.protocol +%{_kf5_servicesdir}/rtspt.protocol +%{_kf5_servicesdir}/rtspu.protocol +%{_kf5_bindir}/ktelnetservice5 +%{_kf5_applicationsdir}/ktelnetservice5.desktop +%{_kf5_plugindir}/kf5/kio/trash.so +%{_kf5_bindir}/ktrash5 +%{_kf5_plugindir}/kcm_trash.so +%{_kf5_servicesdir}/trash.protocol +%{_kf5_servicesdir}/kcmtrash.desktop +%{_kf5_libexecdir}/kiod5 +%{_kf5_sharedir}/dbus-1/services/org.kde.kiod5.service +%dir %{_kf5_plugindir}/kf5/kiod +%{_kf5_plugindir}/kf5/kiod/kssld.so %files %defattr(-,root,root) %doc COPYING* README* -%{_kf5_bindir}/ktrash5 -%{_kf5_bindir}/ktelnetservice5 -%{_kf5_bindir}/kmailservice5 -%{_kf5_libdir}/libKF5KIOCore.so.* %{_kf5_libdir}/libKF5KIOWidgets.so.* %{_kf5_libdir}/libKF5KIOFileWidgets.so.* -%{_kf5_libdir}/libKF5KIONTLM.so.* -%{_kf5_configdir}/accept-languages.codes %{_kf5_configdir}/kshorturifilterrc %{_kf5_servicetypesdir}/ -%{_kf5_plugindir}/ -%{_kf5_servicesdir}/ -%{_kf5_libexecdir}/kio_http_cache_cleaner %{_kf5_bindir}/kcookiejar5 %{_kf5_datadir}/kcookiejar/ -%{_kf5_applicationsdir}/kmailservice5.desktop -%{_kf5_applicationsdir}/ktelnetservice5.desktop %{_kf5_libexecdir}/kpac_dhcp_helper %{_kf5_libexecdir}/kioslave %{_kf5_libexecdir}/kioexec %{_kf5_notifydir}/proxyscout.notifyrc -%{_kf5_libexecdir}/kiod5 -%{_kf5_sharedir}/dbus-1/services/org.kde.kiod5.service +%{_kf5_plugindir}/kcm_kio.so +%{_kf5_plugindir}/kcm_webshortcuts.so +%dir %{_kf5_plugindir}/kf5/kded +%{_kf5_plugindir}/kf5/kded/kcookiejar.so +%{_kf5_plugindir}/kf5/kded/kpasswdserver.so +%{_kf5_plugindir}/kf5/kded/proxyscout.so +%{_kf5_plugindir}/kf5/urifilters/ +%{_kf5_servicesdir}/cache.desktop +%{_kf5_servicesdir}/cookies.desktop +%{_kf5_servicesdir}/fixhosturifilter.desktop +%dir %{_kf5_servicesdir}/kded +%{_kf5_servicesdir}/kded/proxyscout.desktop +%{_kf5_servicesdir}/kshorturifilter.desktop +%{_kf5_servicesdir}/kuriikwsfilter.desktop +%{_kf5_servicesdir}/kurisearchfilter.desktop +%{_kf5_servicesdir}/localdomainurifilter.desktop +%{_kf5_servicesdir}/netpref.desktop +%{_kf5_servicesdir}/proxy.desktop +%{_kf5_servicesdir}/searchproviders/ +%{_kf5_servicesdir}/smb.desktop +%{_kf5_servicesdir}/useragent.desktop +%{_kf5_servicesdir}/useragentstrings/ +%{_kf5_servicesdir}/webshortcuts.desktop %doc %lang(en) %{_kf5_mandir}/*/kcookiejar5.* %dir %{_kf5_htmldir}/en %dir %{_kf5_htmldir} ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.hgfZoH/_old 2015-04-13 20:26:40.000000000 +0200 +++ /var/tmp/diff_new_pack.hgfZoH/_new 2015-04-13 20:26:40.000000000 +0200 @@ -1,3 +1,7 @@ +kio-core + conflicts "kio-<targettype> <= 5.8.0" kio + requires "kio-core-<targettype> = <version>" kio-devel + requires "kio-core-<targettype> = <version>" requires "kio-<targettype> = <version>" ++++++ kio-5.8.0.tar.xz -> kio-5.9.0.tar.xz ++++++ ++++ 81396 lines of diff (skipped) ++++++ kio_help-fallback-to-kde4-docs.patch ++++++ diff --git a/src/ioslaves/help/kio_help.cpp b/src/ioslaves/help/kio_help.cpp index 5abd4c8..5bc692b 100644 --- a/src/ioslaves/help/kio_help.cpp +++ b/src/ioslaves/help/kio_help.cpp @@ -49,7 +49,9 @@ QString HelpProtocol::langLookup(const QString &fname) QStringList search; // assemble the local search paths - const QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory); + QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory); + QStringList fallbacklocalDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/kde/HTML", QStandardPaths::LocateDirectory); + localDoc.append(fallbacklocalDoc); QStringList langs = QLocale().uiLanguages(); langs.append("en");
