From 97309d81d0295b5a55d68aafe81954a92cb463ab534b54a2db262b315e1716bf Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 12 Sep 2017 18:56:47 +0000 Subject: [PATCH 1/3] KDE Frameworks 5.38.0 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=154 --- frameworkintegration-5.37.0.tar.xz | 3 --- frameworkintegration-5.38.0.tar.xz | 3 +++ frameworkintegration.changes | 11 +++++++++++ frameworkintegration.spec | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) delete mode 100644 frameworkintegration-5.37.0.tar.xz create mode 100644 frameworkintegration-5.38.0.tar.xz diff --git a/frameworkintegration-5.37.0.tar.xz b/frameworkintegration-5.37.0.tar.xz deleted file mode 100644 index 2a0337a..0000000 --- a/frameworkintegration-5.37.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa8ca045ba97899b739077e07a961b9e402520a0abfcee8be90baa85251c9e5d -size 1752004 diff --git a/frameworkintegration-5.38.0.tar.xz b/frameworkintegration-5.38.0.tar.xz new file mode 100644 index 0000000..e586869 --- /dev/null +++ b/frameworkintegration-5.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08cb88ef7c7ceb7cd43cbc7f3040daf7128d22bb75f8eb3956d55afd3e1b3670 +size 1752696 diff --git a/frameworkintegration.changes b/frameworkintegration.changes index 7be6161..fe0491a 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Sep 12 07:11:16 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: + * Return high-resolution line edit clear icon + * Fix accepting dialogs with ctrl+return when buttons are renamed + ------------------------------------------------------------------- Sat Aug 12 09:23:14 UTC 2017 - christophe@krop.fr diff --git a/frameworkintegration.spec b/frameworkintegration.spec index ce50b7c..81c0e39 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -17,9 +17,9 @@ %define lname libKF5Style5 -%define _tar_path 5.37 +%define _tar_path 5.38 Name: frameworkintegration -Version: 5.37.0 +Version: 5.38.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 From 7884360378b567ac4f026e634245134c79b4e484a68bf5da7b4e5899df8edea6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 09:58:07 +0000 Subject: [PATCH 2/3] Changes for KUF-KF5 syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=155 --- frameworkintegration.spec | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 81c0e39..99c1a48 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -18,22 +18,27 @@ %define lname libKF5Style5 %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}')} +%define kf5_version %{version} Name: frameworkintegration Version: 5.38.0 Release: 0 %define kf5_version %{version} 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: kconfigwidgets-devel >= %{_tar_path} +BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: kiconthemes-devel >= %{_tar_path} -BuildRequires: kio-devel >= %{_tar_path} -BuildRequires: knotifications-devel >= %{_tar_path} -BuildRequires: kpackage-devel >= %{_tar_path} -BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} +BuildRequires: kio-devel >= %{_kf5_bugfix_version} +BuildRequires: knotifications-devel >= %{_kf5_bugfix_version} +BuildRequires: kpackage-devel >= %{_kf5_bugfix_version} +BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} %if 0%{?suse_version} >= 1330 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) BuildRequires: cmake(AppStreamQt) >= 0.10.4 %endif @@ -91,8 +96,8 @@ Summary: Plugins responsible for better integration of Qt applications in Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kconfigwidgets-devel >= %{_tar_path} -Requires: kiconthemes-devel >= %{_tar_path} +Requires: kconfigwidgets-devel >= %{_kf5_bugfix_version} +Requires: kiconthemes-devel >= %{_kf5_bugfix_version} %description devel Framework Integration is a set of plugins responsible for better From a8b7aa5c010220b0d8025231aee3e7acac91e7e21072df7f801a7898c0a229a4 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 09:59:20 +0000 Subject: [PATCH 3/3] Changes for KUF-KF5 syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=156 --- frameworkintegration.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 99c1a48..b96c8e1 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -22,11 +22,9 @@ %{!?_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} Name: frameworkintegration Version: 5.38.0 Release: 0 -%define kf5_version %{version} BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes