From f1724540a2348acf16052fb3248673e167436bde2e28a00e77abd2b648d03f01 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 23 Jul 2015 11:22:10 +0000 Subject: [PATCH 1/2] Accepting request 318137 from home:mlin7442:fun_plasma5 fix those version condition for 42 OBS-URL: https://build.opensuse.org/request/show/318137 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-addons?expand=0&rev=46 --- plasma5-addons.changes | 5 +++++ plasma5-addons.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plasma5-addons.changes b/plasma5-addons.changes index 8e00d81..b07abd0 100644 --- a/plasma5-addons.changes +++ b/plasma5-addons.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 23 10:51:47 UTC 2015 - mlin@suse.com + +- Fix those version condition for 42 + ------------------------------------------------------------------- Sun Jun 28 18:32:27 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/plasma5-addons.spec b/plasma5-addons.spec index 49793f7..565feaa 100644 --- a/plasma5-addons.spec +++ b/plasma5-addons.spec @@ -59,7 +59,7 @@ BuildRequires: pkgconfig(xcb-keysyms) Recommends: %{name}-lang %endif Recommends: %{name}-kimpanel -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1314 Provides: plasma-addons = %{version} Obsoletes: plasma-addons < %{version} %else From ea17d7af818f0a82946f043ec5ca6ecca0cc17643df0f8854e7171d0b94fd1ad Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 23 Jul 2015 17:12:18 +0000 Subject: [PATCH 2/2] Accepting request 318179 from home:mlin7442:fun_plasma5 fix the previous commit, do not affect openSUSE 13.2. no changelog then. OBS-URL: https://build.opensuse.org/request/show/318179 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-addons?expand=0&rev=47 --- plasma5-addons.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasma5-addons.spec b/plasma5-addons.spec index 565feaa..fd9ca93 100644 --- a/plasma5-addons.spec +++ b/plasma5-addons.spec @@ -59,7 +59,7 @@ BuildRequires: pkgconfig(xcb-keysyms) Recommends: %{name}-lang %endif Recommends: %{name}-kimpanel -%if 0%{?suse_version} > 1314 +%if 0%{?suse_version} > 1314 && "%{suse_version}" != "1320" Provides: plasma-addons = %{version} Obsoletes: plasma-addons < %{version} %else