From d509554c46bf043ec869d43f9a9f3403c3ace9eccd4cdb9d12dc3baf856787c5 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 12 Sep 2017 18:57:51 +0000 Subject: [PATCH 1/3] KDE Frameworks 5.38.0 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=145 --- kdeclarative-5.37.0.tar.xz | 3 --- kdeclarative-5.38.0.tar.xz | 3 +++ kdeclarative.changes | 10 ++++++++++ kdeclarative.spec | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 kdeclarative-5.37.0.tar.xz create mode 100644 kdeclarative-5.38.0.tar.xz diff --git a/kdeclarative-5.37.0.tar.xz b/kdeclarative-5.37.0.tar.xz deleted file mode 100644 index 91dd547..0000000 --- a/kdeclarative-5.37.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2bdd7e1c6d0f39b4e1573b11078317e9ec72803c63ce4acc4d7de26aa2150c7 -size 169808 diff --git a/kdeclarative-5.38.0.tar.xz b/kdeclarative-5.38.0.tar.xz new file mode 100644 index 0000000..c79538c --- /dev/null +++ b/kdeclarative-5.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b38aba552f06596a47d52d364f7a21784e741cfb0c7f23815f1cf067fd7c6a4 +size 169840 diff --git a/kdeclarative.changes b/kdeclarative.changes index 2ada9e7..65d36e5 100644 --- a/kdeclarative.changes +++ b/kdeclarative.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Sep 12 07:11:17 CEST 2017 - lbeltrame@kde.org + +- Update to 5.38.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.38.0.php +- Changes since 5.37.0: + * None + ------------------------------------------------------------------- Sat Aug 12 09:23:22 UTC 2017 - christophe@krop.fr diff --git a/kdeclarative.spec b/kdeclarative.spec index 5b08cc3..5785031 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.37 +%define _tar_path 5.38 Name: kdeclarative -Version: 5.37.0 +Version: 5.38.0 Release: 0 %define kf5_version %{version} Summary: Integration of QML and KDE workspaces From ea875e82a56d9c9beb0d65a1c4091d50186ab0cefca1a3d4d8db72afe3f23a3b Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 12:19:42 +0000 Subject: [PATCH 2/3] Changes for KF5-KUF syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=146 --- kdeclarative.spec | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/kdeclarative.spec b/kdeclarative.spec index 5785031..d003792 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -19,6 +19,10 @@ %bcond_without lang %define lname libKF5Declarative5 %define _tar_path 5.38 +# 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}')} Name: kdeclarative Version: 5.38.0 Release: 0 @@ -30,19 +34,19 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes -BuildRequires: kconfig-devel >= %{_tar_path} -BuildRequires: kcoreaddons-devel >= %{_tar_path} +BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} +BuildRequires: kcoreaddons-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel >= %{_tar_path} -BuildRequires: kguiaddons-devel >= %{_tar_path} -BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: kiconthemes-devel >= %{_tar_path} -BuildRequires: kio-devel >= %{_tar_path} -BuildRequires: kpackage-devel >= %{_tar_path} -BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: kglobalaccel-devel >= %{_kf5_bugfix_version} +BuildRequires: kguiaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} +BuildRequires: kio-devel >= %{_kf5_bugfix_version} +BuildRequires: kpackage-devel >= %{_kf5_bugfix_version} +BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} BuildRequires: libepoxy-devel BuildRequires: cmake(Qt5Core) >= 5.6.0 BuildRequires: cmake(Qt5Gui) >= 5.6.0 @@ -101,9 +105,9 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: %{name}-components = %{version} Requires: extra-cmake-modules -Requires: kconfig-devel >= %{_tar_path} -Requires: kcoreaddons-devel >= %{_tar_path} -Requires: kpackage-devel >= %{_tar_path} +Requires: kconfig-devel >= %{_kf5_bugfix_version} +Requires: kcoreaddons-devel >= %{_kf5_bugfix_version} +Requires: kpackage-devel >= %{_kf5_bugfix_version} Requires: libKF5CalendarEvents5 = %{version} Requires: libKF5QuickAddons5 = %{version} Requires: cmake(Qt5Qml) >= 5.6.0 From 21c97a553d459847bfed33ccdac02fae7d6cf7e7806f11c9402e218ca6d942ac Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 18 Sep 2017 13:44:39 +0000 Subject: [PATCH 3/3] Add a note for legal for the GPL-2.0 licensed files OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=147 --- kdeclarative.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kdeclarative.spec b/kdeclarative.spec index d003792..6d1c4c4 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -28,6 +28,9 @@ Version: 5.38.0 Release: 0 %define kf5_version %{version} Summary: Integration of QML and KDE workspaces +# Note for legal: GPL-2.0+ files relicensed upstream with permission from the authors +# See commits g7482bef08, g62b8e46 and gaf91457 in the upstream KDE repository. +# They will be part of the next release (5.39) License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org