From 85715b34067001b56dee515be407d7bb6b20e8be Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 25 Jun 2016 16:12:41 -0500 Subject: [PATCH 1/7] kf5-kwayland is part of frameworks (not plasma) --- plasma-integration.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plasma-integration.spec b/plasma-integration.spec index e597e10..018c50b 100644 --- a/plasma-integration.spec +++ b/plasma-integration.spec @@ -15,8 +15,6 @@ URL: https://quickgit.kde.org/?p=%{name}.git %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz -%global majmin_ver %(echo %{version} | cut -d. -f1,2) - BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -34,8 +32,7 @@ BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5WidgetsAddons) - -BuildRequires: cmake(KF5Wayland) >= %{majmin_ver} +BuildRequires: cmake(KF5Wayland) ## TODO: verify this is needed, not 100% sure -- rex BuildRequires: qt5-qtbase-private-devel From de13d1e339b51e8b7d51e9dd78abe9fd7d984a8f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 25 Jun 2016 16:13:10 -0500 Subject: [PATCH 2/7] 5.6.95 --- .gitignore | 1 + plasma-integration.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c0e56a..6d37adb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /plasma-integration-5.6.3.tar.xz /plasma-integration-5.6.4.tar.xz /plasma-integration-5.6.5.tar.xz +/plasma-integration-5.6.95.tar.xz diff --git a/plasma-integration.spec b/plasma-integration.spec index 018c50b..6905c6f 100644 --- a/plasma-integration.spec +++ b/plasma-integration.spec @@ -1,7 +1,7 @@ Name: plasma-integration Summary: Qt Platform Theme integration plugin for Plasma -Version: 5.6.5 -Release: 2%{?dist} +Version: 5.6.95 +Release: 1%{?dist} # KDE e.V. may determine that future LGPL versions are accepted License: LGPLv2 or LGPLv3 @@ -75,6 +75,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sat Jun 25 2016 Rex Dieter - 5.6.95-1 +- 5.6.95 + * Thu Jun 16 2016 Rex Dieter 5.6.5-2 - BR: qt5-qtbase-private-devel diff --git a/sources b/sources index 0c6d96a..3b5b1d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf34fb0e93402001f327bf99c195cebe plasma-integration-5.6.5.tar.xz +688aa327962551b46d175ad3983594b4 plasma-integration-5.6.95.tar.xz From e77b1e8a6cbe0ee4a8803c9721fc6d3369176338 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 25 Jun 2016 16:33:03 -0500 Subject: [PATCH 3/7] BR: KF5WindowSystem --- plasma-integration.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/plasma-integration.spec b/plasma-integration.spec index 6905c6f..2b639c5 100644 --- a/plasma-integration.spec +++ b/plasma-integration.spec @@ -32,6 +32,7 @@ BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(KF5Wayland) ## TODO: verify this is needed, not 100% sure -- rex From 78d6e5c9d6ae95735b44693e84bfbb8fcb885638 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 25 Jun 2016 16:38:59 -0500 Subject: [PATCH 4/7] old sources --- .gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6d37adb..7b0e4e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/plasma-integration-5.6.1.tar.xz -/plasma-integration-5.6.2.tar.xz -/plasma-integration-5.6.3.tar.xz -/plasma-integration-5.6.4.tar.xz -/plasma-integration-5.6.5.tar.xz /plasma-integration-5.6.95.tar.xz From b5e4fd352244eb24ea16d2f219f40a956305b7c6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 25 Jun 2016 17:02:31 -0500 Subject: [PATCH 5/7] fix build add versioned dep on plasma-breeze (re)add majmin_ver macro (still used) --- plasma-integration.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-integration.spec b/plasma-integration.spec index 2b639c5..ec50a19 100644 --- a/plasma-integration.spec +++ b/plasma-integration.spec @@ -15,6 +15,8 @@ URL: https://quickgit.kde.org/?p=%{name}.git %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz +%global majmin_ver %(echo %{version} | cut -d. -f1,2) + BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -39,7 +41,8 @@ BuildRequires: cmake(KF5Wayland) BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -Requires: plasma-breeze >= %{majmin_ver} +BuildRequires: plasma-breeze >= %{version} +Requires: plasma-breeze >= %{version} Requires: breeze-cursor-theme >= %{majmin_ver} Requires: breeze-icon-theme %if 0%{?fedora} < 23 From 7e46268e1c5675a7a831744beaf863a8df64429a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 30 Jun 2016 14:19:09 -0500 Subject: [PATCH 6/7] 5.7.0 --- .gitignore | 1 + plasma-integration.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7b0e4e6..c2a88c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /plasma-integration-5.6.95.tar.xz +/plasma-integration-5.7.0.tar.xz diff --git a/plasma-integration.spec b/plasma-integration.spec index ec50a19..2a48375 100644 --- a/plasma-integration.spec +++ b/plasma-integration.spec @@ -1,6 +1,6 @@ Name: plasma-integration Summary: Qt Platform Theme integration plugin for Plasma -Version: 5.6.95 +Version: 5.7.0 Release: 1%{?dist} # KDE e.V. may determine that future LGPL versions are accepted @@ -79,6 +79,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Jun 30 2016 Rex Dieter - 5.7.0-1 +- 5.7.0 + * Sat Jun 25 2016 Rex Dieter - 5.6.95-1 - 5.6.95 diff --git a/sources b/sources index 3b5b1d6..b12d055 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -688aa327962551b46d175ad3983594b4 plasma-integration-5.6.95.tar.xz +4d9b66c42b5fd77e2e4a8a3853bcc9db plasma-integration-5.7.0.tar.xz From 58a3d0a3b2fc34f21907e6c9fa38201100fce4f6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 12 Jul 2016 12:13:55 -0500 Subject: [PATCH 7/7] 5.7.1 --- .gitignore | 1 + plasma-integration.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c2a88c8..b5c0c04 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /plasma-integration-5.6.95.tar.xz /plasma-integration-5.7.0.tar.xz +/plasma-integration-5.7.1.tar.xz diff --git a/plasma-integration.spec b/plasma-integration.spec index 2a48375..f7defe7 100644 --- a/plasma-integration.spec +++ b/plasma-integration.spec @@ -1,6 +1,6 @@ Name: plasma-integration Summary: Qt Platform Theme integration plugin for Plasma -Version: 5.7.0 +Version: 5.7.1 Release: 1%{?dist} # KDE e.V. may determine that future LGPL versions are accepted @@ -79,6 +79,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Jul 12 2016 Rex Dieter - 5.7.1-1 +- 5.7.1 + * Thu Jun 30 2016 Rex Dieter - 5.7.0-1 - 5.7.0 diff --git a/sources b/sources index b12d055..00c8d3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d9b66c42b5fd77e2e4a8a3853bcc9db plasma-integration-5.7.0.tar.xz +5773a4c50708b7c7e4c14c96f65b1e9a plasma-integration-5.7.1.tar.xz