rdieter pushed to kde-workspace (master). "consistently use Requires: %{name}-common in subpkgs"

[notifications at fedoraproject.org]

From 59f8fd1a24e46e392dfcd8caae9ae71bba44a130 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 7 Jun 2015 20:36:27 -0500
Subject: consistently use Requires: %{name}-common in subpkgs


diff --git a/kde-workspace.spec b/kde-workspace.spec
index d47447d..3ae675e 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -15,7 +15,7 @@ Summary: KDE Workspace
 Name:    kde-workspace
 Epoch:   1
 Version: 4.11.20
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -125,6 +125,7 @@ Requires: kdelibs4-devel
 %package -n kcm_colors
 Summary: Colors KDE Control Module
 Conflicts: kde-workspace < 4.8.0-2
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %{?kde_runtime_requires}
 %description -n kcm_colors
 The Color Selection module is comprised of several sections:
@@ -135,6 +136,7 @@ The Color Selection module is comprised of several sections:
 
 %package -n kde-platform-plugin
 Summary: KDE4 Platform plugin
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %description -n kde-platform-plugin
 %{summary}.
 
@@ -145,7 +147,7 @@ Provides: service(graphical-login) = kdm
 Requires: kgreeter-plugins = %{epoch}:%{version}-%{release}
 Requires: libkworkspace%{?_isa} =  %{epoch}:%{version}-%{release}
 Requires: kde-settings-kdm
-Requires: kde-workspace-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %description -n kdm
 KDM provides the graphical login screen, shown shortly after boot up,
 log out, and when user switching.
@@ -158,7 +160,8 @@ Requires: kdm = %{epoch}:%{version}-%{release}
 # http://bugzilla.redhat.com/753409
 # http://bugzilla.redhat.com/784389
 Requires: kde-wallpapers
-Requires: kde-workspace-common = %{epoch}:%{version}-%{release}
+# kdm already pulls in -common
+#Requires: %{name}-common = %{epoch}:%{version}-%{release}
 BuildArch: noarch
 %description -n kdm-themes
 A collection of kdm themes, including: circles, horos, oxygen, oxygen-air,
@@ -169,7 +172,7 @@ Summary: KDE Greeter Plugin Components
 # kgreet_* plugins moved
 Conflicts: kdm < 4.6.90-4
 Conflicts: kde-workspace < 4.7.80-3
-Requires:  kde-workspace-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %description -n kgreeter-plugins
 %{summary} that are needed by KDM and Screensaver unlocking.
 
@@ -178,7 +181,7 @@ Summary: Runtime libraries for KDE 4 version of ksysguard
 # when spilt occurred
 Conflicts: kdebase-workspace-libs < 4.7.2-2
 Requires: libksysguard-common >= 5
-Requires: kde-workspace-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %{?kdelibs4_requires}
 %description -n ksysguard-libs
 %{summary}.
@@ -188,7 +191,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: kde-workspace-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %{?kdelibs4_requires}
 %description -n libkworkspace
 %{summary}.
@@ -450,6 +453,9 @@ rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/colors/
 
 
 %changelog
+* Sun Jun 07 2015 Rex Dieter <rdieter at fedoraproject.org> 1:4.11.20-2
+- consistently use Requires: %{name}-common in subpkgs
+
 * Wed Jun 03 2015 Rex Dieter <rdieter at fedoraproject.org> 1:4.11.20-1
 - 4.11.20
 - drop deprecated nepomuk bits
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kde-workspace.git/commit/?h=master&id=59f8fd1a24e46e392dfcd8caae9ae71bba44a130