From a313e05b33c8649a45c57e4bf52b4a2984a6d57b2431ce94310751a9faae686b Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 12 Sep 2017 18:59:05 +0000 Subject: [PATCH 1/2] KDE Frameworks 5.38.0 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinit?expand=0&rev=142 --- kinit-5.37.0.tar.xz | 3 --- kinit-5.38.0.tar.xz | 3 +++ kinit.changes | 11 +++++++++++ kinit.spec | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) delete mode 100644 kinit-5.37.0.tar.xz create mode 100644 kinit-5.38.0.tar.xz diff --git a/kinit-5.37.0.tar.xz b/kinit-5.37.0.tar.xz deleted file mode 100644 index 84f39c5..0000000 --- a/kinit-5.37.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9686968cb277a027169bc48ff37a25f44691b1d828af7cee4c6790c89f7ed2c -size 121296 diff --git a/kinit-5.38.0.tar.xz b/kinit-5.38.0.tar.xz new file mode 100644 index 0000000..efd2017 --- /dev/null +++ b/kinit-5.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae49e0a3cf8a86868afb57bfd820c65be60939e4a79d39e54608fcc9f307914c +size 121368 diff --git a/kinit.changes b/kinit.changes index f1b5736..48b3028 100644 --- a/kinit.changes +++ b/kinit.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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: + * klauncher: fix appId matching for flatpak apps + * Drop KLAUNCHER_VERBOSE_OUTPUT ifdefs + ------------------------------------------------------------------- Sat Aug 12 09:23:29 UTC 2017 - christophe@krop.fr diff --git a/kinit.spec b/kinit.spec index eab54b0..8161c7a 100644 --- a/kinit.spec +++ b/kinit.spec @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.37 +%define _tar_path 5.38 Name: kinit -Version: 5.37.0 +Version: 5.38.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 From 82395597712455948266ec0ed5e4623bf150131d0ef8c54c062b9e5d7f2996ea Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 12:42:54 +0000 Subject: [PATCH 2/2] Changes for KF5-KUF syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinit?expand=0&rev=143 --- kinit.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/kinit.spec b/kinit.spec index 8161c7a..0551c6b 100644 --- a/kinit.spec +++ b/kinit.spec @@ -18,20 +18,23 @@ %bcond_without lang %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: kinit 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: kcrash-devel >= %{_tar_path} -BuildRequires: kdoctools-devel >= %{_tar_path} +BuildRequires: kcrash-devel >= %{_kf5_bugfix_version} +BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: kio-devel >= %{_tar_path} -BuildRequires: kservice-devel >= %{_tar_path} -BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kio-devel >= %{_kf5_bugfix_version} +BuildRequires: kservice-devel >= %{_kf5_bugfix_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} BuildRequires: libcap-devel BuildRequires: libcap-progs BuildRequires: cmake(Qt5Core) >= 5.6.0