[kde-workspace/f19] fix runtime deps (%version vs. %_kde4_version)

Rex Dieter rdieter at fedoraproject.org
Thu Feb 6 20:59:35 UTC 2014


commit 1fb074704c2d78a1f940f356c52862848beda262
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Feb 6 15:00:08 2014 -0600

    fix runtime deps (%version vs. %_kde4_version)

 kde-workspace.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index ca0d2e9..27238d0 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -17,7 +17,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.11.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -296,8 +296,8 @@ Obsoletes: kdebase-workspace-libs < 4.7.97-10
 Provides:  kdebase-workspace-libs = %{version}-%{release}
 Provides:  kdebase-workspace-libs%{?_isa} = %{version}-%{release}
 Provides: solid-bluetooth = %{version}-%{release} 
-Requires: kactivities%{?_isa} >= %{version}
-Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kactivities%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
+Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 Requires: libkworkspace%{?_isa} = %{version}-%{release}
 # at least while oyxgen style is default
 Requires: kde-style-oxygen%{?_isa} = %{version}-%{release}
@@ -317,7 +317,7 @@ BuildArch: noarch
 %package -n kcm_colors
 Summary: Colors KDE Control Module
 Conflicts: kde-workspace < 4.8.0-2
-Requires: kde-runtime >= %{version}
+Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 %description -n kcm_colors
 The Color Selection module is comprised of several sections:
 * The Scheme tab, used to manage schemes
@@ -368,7 +368,7 @@ Requires: ksysguard-libs%{?_isa} = %{version}-%{release}
 Summary: Runtime libraries for ksysguard
 # when spilt occurred
 Conflicts: kdebase-workspace-libs < 4.7.2-2
-Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 %description -n ksysguard-libs
 %{summary}.
 
@@ -394,7 +394,7 @@ Summary: Runtime libkworkspace library
 # when spilt occurred
 Conflicts: kdebase-workspace-libs < 4.7.2-2
 Obsoletes: kdebase-workspace-libs-kworkspace < 4.7.2-3
-Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 %description -n libkworkspace
 %{summary}.
 
@@ -430,7 +430,7 @@ Summary: Plasma scriptengine for python
 Obsoletes: %{name}-python-applet < 4.5.80-7
 Provides:  %{name}-python-applet = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
-Requires: pykde4%{?_isa} >= %{version}
+Requires: pykde4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 %description -n plasma-scriptengine-python 
 %{summary}.
 
@@ -1050,6 +1050,9 @@ fi
 
 
 %changelog
+* Thu Feb 06 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.6-2
+- fix runtime deps (%%version vs. %%_kde4_version)
+
 * Fri Jan 31 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.11.6-1
 - 4.11.6
 


More information about the scm-commits mailing list