diff --git a/kf5-kio.spec b/kf5-kio.spec index 535e4c6..a4f78ac 100644 --- a/kf5-kio.spec +++ b/kf5-kio.spec @@ -1,11 +1,12 @@ %global framework kio Name: kf5-%{framework} -Version: 5.55.0 +Version: 5.88.0 Release: 1 Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction + License: GPLv2+ and MIT and BSD -URL: https://cgit.kde.org/%{framework}.git +URL: https://invent.kde.org/frameworks/%{framework} %global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -17,58 +18,109 @@ URL: https://cgit.kde.org/%{framework}.git Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz -## upstreamable patches -# revert part of https://cgit.kde.org/kio.git/commit/src/core/slave.cpp?id=e2a4517f099d809bd53c6a10769ebfddc0f28a8b -# can cause kio to try to use 'kioslave' binary from kdelibs3, -# https://bugzilla.redhat.com/show_bug.cgi?id=1512418#c16 -# https://bugs.kde.org/show_bug.cgi?id=386859 -# https://phabricator.kde.org/D8810 -Patch100: kio-slave_path.patch - # filter plugin provides %global __provides_exclude_from ^(%{_kf5_qtplugindir}/.*\\.so)$ -BuildRequires: extra-cmake-modules >= %{majmin} kf5-rpm-macros kf5-karchive-devel >= %{majmin} kf5-kconfig-devel >= %{majmin} kf5-kcoreaddons-devel >= %{majmin} kf5-kcrash-devel >= %{majmin} kf5-kdoctools-devel >= %{majmin} kf5-kdbusaddons-devel >= %{majmin} kf5-ki18n-devel >= %{majmin} kf5-kservice-devel >= %{majmin} kf5-solid-devel >= %{majmin} kf5-kbookmarks-devel >= %{majmin} kf5-kcompletion-devel >= %{majmin} kf5-kconfigwidgets-devel >= %{majmin} kf5-kiconthemes-devel >= %{majmin} kf5-kitemviews-devel >= %{majmin} kf5-kjobwidgets-devel >= %{majmin} kf5-kwindowsystem-devel >= %{majmin} kf5-knotifications-devel >= %{majmin} kf5-ktextwidgets-devel >= %{majmin} kf5-kwallet-devel >= %{majmin} kf5-kwidgetsaddons-devel >= %{majmin} kf5-kxmlgui-devel >= %{majmin} krb5-devel libacl-devel qt5-qtbase-devel qt5-qtscript-devel qt5-qtx11extras-devel zlib-devel +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-rpm-macros +# core +BuildRequires: kf5-karchive-devel >= %{majmin} +BuildRequires: kf5-kconfig-devel >= %{majmin} +BuildRequires: kf5-kcoreaddons-devel >= %{majmin} +BuildRequires: kf5-kcrash-devel >= %{majmin} +BuildRequires: kf5-kdoctools-devel >= %{majmin} +BuildRequires: kf5-kdbusaddons-devel >= %{majmin} +BuildRequires: kf5-kguiaddons-devel >= %{majmin} +BuildRequires: kf5-ki18n-devel >= %{majmin} +BuildRequires: kf5-kservice-devel >= %{majmin} +BuildRequires: kf5-solid-devel >= %{majmin} +# extras +BuildRequires: kf5-kbookmarks-devel >= %{majmin} +BuildRequires: kf5-kcompletion-devel >= %{majmin} +BuildRequires: kf5-kconfigwidgets-devel >= %{majmin} +BuildRequires: kf5-kiconthemes-devel >= %{majmin} +BuildRequires: kf5-kitemviews-devel >= %{majmin} +BuildRequires: kf5-kjobwidgets-devel >= %{majmin} +BuildRequires: kf5-kwindowsystem-devel >= %{majmin} +# others +BuildRequires: kf5-knotifications-devel >= %{majmin} +BuildRequires: kf5-ktextwidgets-devel >= %{majmin} +BuildRequires: kf5-kwallet-devel >= %{majmin} +BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} +BuildRequires: kf5-kxmlgui-devel >= %{majmin} -%if !0%{?flatpak} -BuildRequires: libxml2-devel libxslt-devel +BuildRequires: krb5-devel +BuildRequires: libacl-devel + +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtscript-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qtdeclarative-devel + +%if !0%{?flatpak} +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel +%endif +BuildRequires: pkgconfig(blkid) +BuildRequires: pkgconfig(mount) +BuildRequires: zlib-devel + + +%if ! 0%{?bootstrap} +BuildRequires: kf5-kded-devel %endif -Requires: %{name}-core%{?_isa} = %{version}-%{release} %{name}-widgets%{?_isa} = %{version}-%{release} %{name}-file-widgets%{?_isa} = %{version}-%{release} %{name}-ntlm%{?_isa} = %{version}-%{release} %{name}-gui%{?_isa} = %{version}-%{release} +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-widgets%{?_isa} = %{version}-%{release} +Requires: %{name}-file-widgets%{?_isa} = %{version}-%{release} +Requires: %{name}-ntlm%{?_isa} = %{version}-%{release} +Requires: %{name}-gui%{?_isa} = %{version}-%{release} + +Requires: kf5-kded + %description KDE Frameworks 5 Tier 3 solution for filesystem abstraction %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} kf5-kbookmarks-devel >= %{majmin} kf5-kcompletion-devel >= %{majmin} kf5-kconfig-devel >= %{majmin} kf5-kcoreaddons-devel >= %{majmin} kf5-kitemviews-devel >= %{majmin} kf5-kjobwidgets-devel >= %{majmin} kf5-kservice-devel >= %{majmin} kf5-solid-devel >= %{majmin} kf5-kxmlgui-devel >= %{majmin} qt5-qtbase-devel - +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: kf5-kbookmarks-devel >= %{majmin} +Requires: kf5-kcompletion-devel >= %{majmin} +Requires: kf5-kconfig-devel >= %{majmin} +Requires: kf5-kcoreaddons-devel >= %{majmin} +Requires: kf5-kitemviews-devel >= %{majmin} +Requires: kf5-kjobwidgets-devel >= %{majmin} +Requires: kf5-kservice-devel >= %{majmin} +Requires: kf5-solid-devel >= %{majmin} +Requires: kf5-kxmlgui-devel >= %{majmin} +Requires: kf5-kwindowsystem-devel >= %{majmin} +Requires: qt5-qtbase-devel %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package help +%package doc Summary: Documentation files for %{name} Requires: %{name}-core = %{version}-%{release} -Obsoletes: kf5-kio-help < 5.11.0-3 +Obsoletes: kf5-kio-doc < 5.11.0-3 BuildArch: noarch - -%description help +%description doc Documentation for %{name}. %package core Summary: Core components of the KIO Framework ## org.kde.klauncher5 service referenced from : src/core/slave.cpp %{?kf5_kinit_requires} -Requires: %{name}-core-libs%{?_isa} = %{version}-%{release} %{name}-help = %{version}-%{release} - +Requires: %{name}-core-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-doc = %{version}-%{release} %description core KIOCore library provides core non-GUI components for working with KIO. %package core-libs Summary: Runtime libraries for KIO Core Requires: %{name}-core = %{version}-%{release} - %description core-libs %{summary}. @@ -78,7 +130,6 @@ Summary: Widgets for KIO Framework ## included here for completeness, even those -core already has a dependency. %{?kf5_kinit_requires} Requires: %{name}-core%{?_isa} = %{version}-%{release} - %description widgets KIOWidgets contains classes that provide generic job control, progress reporting, etc. @@ -86,14 +137,12 @@ reporting, etc. %package widgets-libs Summary: Runtime libraries for KIO Widgets library Requires: %{name}-widgets = %{version}-%{release} - %description widgets-libs %{summary}. %package file-widgets Summary: Widgets for file-handling for KIO Framework Requires: %{name}-widgets%{?_isa} = %{version}-%{release} - %description file-widgets The KIOFileWidgets library provides the file selection dialog and its components. @@ -101,13 +150,11 @@ its components. %package gui Summary: Gui components for the KIO Framework Requires: %{name}-core%{?_isa} = %{version}-%{release} - %description gui %{summary}. %package ntlm Summary: NTLM support for KIO Framework - %description ntlm KIONTLM provides support for NTLM authentication mechanism in KIO @@ -132,35 +179,25 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files -%license COPYING.LIB +%license LICENSES/*.txt %doc README.md %files core %{_kf5_sysconfdir}/xdg/accept-languages.codes -%{_kf5_sysconfdir}/xdg/%{framework}.categories +%{_kf5_datadir}/qlogging-categories5/*categories %{_kf5_libexecdir}/kio_http_cache_cleaner %{_kf5_libexecdir}/kpac_dhcp_helper %{_kf5_libexecdir}/kioexec -%{_kf5_libexecdir}/kioslave +%{_kf5_libexecdir}/kioslave5 %{_kf5_libexecdir}/kiod5 %{_kf5_bindir}/ktelnetservice5 %{_kf5_bindir}/kcookiejar5 %{_kf5_bindir}/ktrash5 %{_kf5_plugindir}/kio/ %{_kf5_plugindir}/kded/ -%{_kf5_qtplugindir}/kcm_kio.so -%{_kf5_qtplugindir}/kcm_trash.so +%{_kf5_qtplugindir}/kcm_*.so %{_kf5_plugindir}/kiod/ -%{_kf5_datadir}/kservices5/cache.desktop -%{_kf5_datadir}/kservices5/cookies.desktop -%{_kf5_datadir}/kservices5/netpref.desktop -%{_kf5_datadir}/kservices5/proxy.desktop -%{_kf5_datadir}/kservices5/smb.desktop -%{_kf5_datadir}/kservices5/useragent.desktop -%{_kf5_datadir}/kservices5/*.protocol -%{_kf5_datadir}/kservices5/http_cache_cleaner.desktop -%{_kf5_datadir}/kservices5/kcmtrash.desktop -%{_kf5_datadir}/kservices5/useragentstrings +%{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/knotifications5/proxyscout.* %{_kf5_datadir}/kf5/kcookiejar/domain_info %{_kf5_datadir}/applications/*.desktop @@ -181,7 +218,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files core-libs %{_kf5_libdir}/libKF5KIOCore.so.* -%files help -f %{name}.lang +%files doc -f %{name}.lang %{_kf5_mandir}/man8/kcookiejar5.8* %if !0%{?_with_html:1} %{_kf5_docdir}/HTML/*/* @@ -205,6 +242,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files widgets-libs %{_kf5_libdir}/libKF5KIOWidgets.so.* +%{_kf5_qtplugindir}/designer/*5widgets.so %ldconfig_scriptlets file-widgets @@ -227,9 +265,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KIOGui.pri %{_datadir}/dbus-1/interfaces/*.xml %{_kf5_bindir}/protocoltojson +%dir %{_kf5_datadir}/kdevappwizard/ +%dir %{_kf5_datadir}/kdevappwizard/templates/ +%{_kf5_datadir}/kdevappwizard/templates/ioslave* %changelog +* Sun Jan 16 2022 pei-jiankang - 5.88.0-1 +- update to upstream version 5.88.0 + * Mon Aug 17 2020 yeqinglong - 5.55.0-1 - Initial release for OpenEuler diff --git a/kf5-kio.yaml b/kf5-kio.yaml index f7e39d9..382e3d5 100644 --- a/kf5-kio.yaml +++ b/kf5-kio.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: KDE/kio tag_prefix: "^v" -seperator: "." +separator: "." diff --git a/kio-5.55.0.tar.xz b/kio-5.55.0.tar.xz deleted file mode 100644 index 64cc090..0000000 Binary files a/kio-5.55.0.tar.xz and /dev/null differ diff --git a/kio-5.88.0.tar.xz b/kio-5.88.0.tar.xz new file mode 100644 index 0000000..0fd512a Binary files /dev/null and b/kio-5.88.0.tar.xz differ diff --git a/kio-slave_path.patch b/kio-slave_path.patch deleted file mode 100644 index fafdc16..0000000 --- a/kio-slave_path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up kio-5.40.0/src/core/slave.cpp.path kio-5.40.0/src/core/slave.cpp ---- kio-5.40.0/src/core/slave.cpp.path 2017-11-05 02:33:04.000000000 -0600 -+++ kio-5.40.0/src/core/slave.cpp 2017-11-13 10:04:14.921095694 -0600 -@@ -504,7 +504,6 @@ Slave *Slave::createSlave(const QString - - // search paths - const QStringList searchPaths = QStringList() -- << QCoreApplication::applicationDirPath() // then look where our application binary is located - << QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath) // look where libexec path is (can be set in qt.conf) - << QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location - const QString kioslaveExecutable = QStandardPaths::findExecutable(QStringLiteral("kioslave"), searchPaths);