diff --git a/baselibs.conf b/baselibs.conf index 584d6b4..1b7ddfa 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,7 @@ +kio-core + conflicts "kio- <= 5.8.0" kio + requires "kio-core- = " kio-devel + requires "kio-core- = " requires "kio- = " diff --git a/kio-5.8.0.tar.xz b/kio-5.8.0.tar.xz deleted file mode 100644 index e091a6b..0000000 --- a/kio-5.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a89b0e5125013d9c34a75e572fb7c81f4b0e6e041d43850301423e6b0d5ff21 -size 2841752 diff --git a/kio-5.9.0.tar.xz b/kio-5.9.0.tar.xz new file mode 100644 index 0000000..5e52b8f --- /dev/null +++ b/kio-5.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c423c335ab05d6b8dd1162535a28fd8a33219fb7345db8c1dfd1d38fc4711359 +size 2844868 diff --git a/kio.changes b/kio.changes index 5f94476..08941c4 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Apr 4 14:40:53 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.9.0 + * 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) + ------------------------------------------------------------------- Mon Mar 16 11:58:09 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index f435026..5d75fb0 100644 --- a/kio.spec +++ b/kio.spec @@ -16,13 +16,13 @@ # -%define _tar_path 5.8 +%define _tar_path 5.9 Name: kio Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{version} BuildRequires: fdupes BuildRequires: karchive-devel >= %{kf5_version} BuildRequires: kbookmarks-devel >= %{kf5_version} @@ -59,6 +59,7 @@ BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(x11) +Requires: %{name}-core = %{version} Recommends: %{name}-lang = %{version} Recommends: kio-extras5 # KIO/FileDialog uses klauncher directly, but we can't add Requires, as that would introduce dep cycle @@ -76,10 +77,23 @@ 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. +%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} @@ -110,7 +124,15 @@ Development files. %kf5_makeinstall -C build %fdupes -s %{buildroot} - %find_lang %{name}5 %{name}5.lang +if [ -e po ]; then +%find_lang %{name}5 %{name}5.lang +else +touch %{name}5.lang +fi + +%post core -p /sbin/ldconfig + +%postun core -p /sbin/ldconfig %post -p /sbin/ldconfig @@ -124,32 +146,86 @@ Development files. %doc %lang(sv) %{_kf5_mandir}/sv %doc %lang(uk) %{_kf5_mandir}/uk +%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}