From c7ddd60f27329a9ae0fb32a7c47c97d0dd5ab580c43567e4349239c59dba6dbd Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 08:22:57 +0000 Subject: [PATCH 1/4] KDE Frameworks 5.33 - Automated change, please review OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=177 --- kio-5.32.0.tar.xz | 3 --- kio-5.33.0.tar.xz | 3 +++ kio.changes | 26 +++++++++++++++++++++++++- kio.spec | 4 ++-- 4 files changed, 30 insertions(+), 6 deletions(-) delete mode 100644 kio-5.32.0.tar.xz create mode 100644 kio-5.33.0.tar.xz diff --git a/kio-5.32.0.tar.xz b/kio-5.32.0.tar.xz deleted file mode 100644 index f18e39f..0000000 --- a/kio-5.32.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:364adf30d1df6f52d5960061d4c21e91519dfa8674ae95fa01144805a800aaa5 -size 3092884 diff --git a/kio-5.33.0.tar.xz b/kio-5.33.0.tar.xz new file mode 100644 index 0000000..193e18d --- /dev/null +++ b/kio-5.33.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e15ff51931192da0ef4635c0fcf76ca821e75a580113db99aee7c38a52f9ade +size 3072192 diff --git a/kio.changes b/kio.changes index 54e0e84..5275fea 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat Apr 15 10:11:51 CEST 2017 - lbeltrame@kde.org + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * make remote file:// URL redirect to smb:// work again + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * keep query encoding when HTTP Proxy is used + * Fix minor typos + * User messages cleanup (and de-emphasize Konqueror) + * Updated user agents (Firefox 52 ESR, Chromium 57) + * Added plugin actions + * Simple patch + * autotest: comment why the SSE-disabling thing doesn't work (QTBUG-47566) + * Handle/truncate url display string assigned to job description. Prevents large data: urls from being included in UI notifications. + * Restore Cancel button shortcut + * Upgrade KF5 version to 5.33.0. + * Add KFileWidget::setSelectedUrl() + * Fix KUrlRequester save mode by adding setAcceptMode REVIEW: 129986 + * With this change it is now possible to list multiple paths as defined via the command line. + ------------------------------------------------------------------- Wed Apr 12 10:03:26 UTC 2017 - wbauer@tmo.at @@ -9,7 +33,7 @@ Wed Apr 12 10:03:26 UTC 2017 - wbauer@tmo.at ------------------------------------------------------------------- Mon Mar 20 15:24:03 UTC 2017 - lbeltrame@kde.org -- Drop sanitize-url-for-proxy.patch, merged upstream +- Drop sanitize-url-for-proxy.patch, merged upstream ------------------------------------------------------------------- Sun Mar 19 14:50:47 CET 2017 - lbeltrame@kde.org diff --git a/kio.spec b/kio.spec index a58a021..8e7c5d1 100644 --- a/kio.spec +++ b/kio.spec @@ -19,7 +19,7 @@ %bcond_without lang %define _tar_path 5.32 Name: kio -Version: 5.32.0 +Version: 5.33.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -86,8 +86,8 @@ 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 +Group: System/GUI/KDE Conflicts: kio <= 5.8.0 %description core From 40bb2aa851c73750b8427f19ab6806ed7fea7daf141820567e07753084087f98 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 09:51:00 +0000 Subject: [PATCH 2/4] Fix _tar_path version OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=178 --- kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kio.spec b/kio.spec index 8e7c5d1..0a5dde7 100644 --- a/kio.spec +++ b/kio.spec @@ -17,7 +17,7 @@ %bcond_without lang -%define _tar_path 5.32 +%define _tar_path 5.33 Name: kio Version: 5.33.0 Release: 0 From 6c48406779b85372b0dd106511040e250f111bb130ac741a8324cbdf9b48f881 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 17 Apr 2017 16:14:27 +0000 Subject: [PATCH 3/4] Put _kf5_bugfix_version to ease maintenance instead of relying on _tar_path (port from KUF) OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=179 --- kio.spec | 67 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/kio.spec b/kio.spec index 0a5dde7..7e75f24 100644 --- a/kio.spec +++ b/kio.spec @@ -17,38 +17,41 @@ %bcond_without lang -%define _tar_path 5.33 Name: kio Version: 5.33.0 Release: 0 +# Full KF5 version (e.g. 5.33.0) +%{!?_kf5_version: %global _kf5_version %{version}} +# Last major and minor KF5 version (e.g. 5.33) +%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %define kf5_version %{version} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes -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: karchive-devel >= %{_kf5_bugfix_version} +BuildRequires: kbookmarks-devel >= %{_kf5_bugfix_version} +BuildRequires: kcompletion-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} +BuildRequires: kcoreaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kdbusaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -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: kguiaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} +BuildRequires: kitemviews-devel >= %{_kf5_bugfix_version} +BuildRequires: kjobwidgets-devel >= %{_kf5_bugfix_version} +BuildRequires: knotifications-devel >= %{_kf5_bugfix_version} BuildRequires: krb5-devel -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: kservice-devel >= %{_kf5_bugfix_version} +BuildRequires: ktextwidgets-devel >= %{_kf5_bugfix_version} +BuildRequires: kwallet-devel >= %{_kf5_bugfix_version} +BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} +BuildRequires: kxmlgui-devel >= %{_kf5_bugfix_version} BuildRequires: libacl-devel BuildRequires: libattr-devel -BuildRequires: solid-devel >= %{_tar_path} +BuildRequires: solid-devel >= %{_kf5_bugfix_version} BuildRequires: cmake(Qt5Concurrent) >= 5.6.0 BuildRequires: cmake(Qt5Core) >= 5.6.0 BuildRequires: cmake(Qt5DBus) >= 5.6.0 @@ -71,7 +74,7 @@ Summary: Network transparent access to files and data License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/%{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 @@ -102,15 +105,15 @@ Group: Development/Libraries/KDE Requires: %{name} = %{version} Requires: %{name}-core = %{version} Requires: extra-cmake-modules -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: kbookmarks-devel >= %{_kf5_bugfix_version} +Requires: kcompletion-devel >= %{_kf5_bugfix_version} +Requires: kconfig-devel >= %{_kf5_bugfix_version} +Requires: kcoreaddons-devel >= %{_kf5_bugfix_version} +Requires: kitemviews-devel >= %{_kf5_bugfix_version} +Requires: kjobwidgets-devel >= %{_kf5_bugfix_version} +Requires: kservice-devel >= %{_kf5_bugfix_version} +Requires: kxmlgui-devel >= %{_kf5_bugfix_version} +Requires: solid-devel >= %{_kf5_bugfix_version} Requires: cmake(Qt5Network) >= 5.6.0 %description devel From d38f05c2ecb9b8fbcdbeac15dea3cb6ea0dfa702c81138ecb8aed6dec392100e Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:25:23 +0000 Subject: [PATCH 4/4] Revert to using _tar_path to fix Factory submission OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=181 --- kio.spec | 67 +++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/kio.spec b/kio.spec index 7e75f24..0a5dde7 100644 --- a/kio.spec +++ b/kio.spec @@ -17,41 +17,38 @@ %bcond_without lang +%define _tar_path 5.33 Name: kio Version: 5.33.0 Release: 0 -# Full KF5 version (e.g. 5.33.0) -%{!?_kf5_version: %global _kf5_version %{version}} -# Last major and minor KF5 version (e.g. 5.33) -%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %define kf5_version %{version} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: karchive-devel >= %{_kf5_bugfix_version} -BuildRequires: kbookmarks-devel >= %{_kf5_bugfix_version} -BuildRequires: kcompletion-devel >= %{_kf5_bugfix_version} -BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} -BuildRequires: kcoreaddons-devel >= %{_kf5_bugfix_version} -BuildRequires: kdbusaddons-devel >= %{_kf5_bugfix_version} -BuildRequires: kdoctools-devel >= %{_kf5_bugfix_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_bugfix_version} -BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} -BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} -BuildRequires: kitemviews-devel >= %{_kf5_bugfix_version} -BuildRequires: kjobwidgets-devel >= %{_kf5_bugfix_version} -BuildRequires: knotifications-devel >= %{_kf5_bugfix_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_bugfix_version} -BuildRequires: ktextwidgets-devel >= %{_kf5_bugfix_version} -BuildRequires: kwallet-devel >= %{_kf5_bugfix_version} -BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} -BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} -BuildRequires: kxmlgui-devel >= %{_kf5_bugfix_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_bugfix_version} +BuildRequires: solid-devel >= %{_tar_path} BuildRequires: cmake(Qt5Concurrent) >= 5.6.0 BuildRequires: cmake(Qt5Core) >= 5.6.0 BuildRequires: cmake(Qt5DBus) >= 5.6.0 @@ -74,7 +71,7 @@ Summary: Network transparent access to files and data License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/%{name}-%{version}.tar.xz +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 @@ -105,15 +102,15 @@ Group: Development/Libraries/KDE Requires: %{name} = %{version} Requires: %{name}-core = %{version} Requires: extra-cmake-modules -Requires: kbookmarks-devel >= %{_kf5_bugfix_version} -Requires: kcompletion-devel >= %{_kf5_bugfix_version} -Requires: kconfig-devel >= %{_kf5_bugfix_version} -Requires: kcoreaddons-devel >= %{_kf5_bugfix_version} -Requires: kitemviews-devel >= %{_kf5_bugfix_version} -Requires: kjobwidgets-devel >= %{_kf5_bugfix_version} -Requires: kservice-devel >= %{_kf5_bugfix_version} -Requires: kxmlgui-devel >= %{_kf5_bugfix_version} -Requires: solid-devel >= %{_kf5_bugfix_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: cmake(Qt5Network) >= 5.6.0 %description devel