[kde-workspace] kcm_colors subpkg (#761184)

[Rex Dieter]

commit 93e26ded06156199dae324682777cc486cf7e103
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 24 14:26:58 2012 -0600

    kcm_colors subpkg (#761184)
    
    - kdm-themes: Requires: kde-wallpapers unconditionally (#784389)

 kde-workspace.spec |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 9589b7e..2940917 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -6,7 +6,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -173,6 +173,7 @@ Obsoletes: plasma-scriptengine-googlegadgets < %{version}-%{release}
 %endif
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: kcm_colors = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdebase-runtime >= %{version}
 
@@ -247,9 +248,18 @@ BuildArch: noarch
 %description ksplash-themes
 %{summary}, including Default (Air and Horos).
 
+%package -n kcm_colors
+Summary: Colors KDE Control Module
+Conflicts: kde-workspace < 4.8.0-2
+%description -n kcm_colors
+The Color Selection module is comprised of several sections:
+* The Scheme tab, used to manage schemes
+* The Options tab, used to change the options of the current scheme
+* The Colors tab, used to change the colors of the current scheme
+* The state effects tabs (Inactive, Disabled)
+
 %package -n kdm
 Summary: The KDE login manager
-group: User Interface/X
 Provides: kdebase-kdm = %{version}-%{release}
 Provides: service(graphical-login) = kdm
 Requires: libkworkspace%{?_isa} =  %{version}-%{release}
@@ -264,9 +274,8 @@ group: User Interface/X
 Obsoletes: kdm < 4.7.3-9
 Requires: kdm = %{version}-%{release}
 # http://bugzilla.redhat.com/753409
-%if 0%{?fedora} > 16
+# http://bugzilla.redhat.com/784389
 Requires: kde-wallpapers = %{version}
-%endif
 BuildArch: noarch
 %description -n kdm-themes
 A collection of kdm themes, including: circles, horos, oxygen, oxygen-air,
@@ -461,7 +470,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 update-desktop-database -q &> /dev/null || :
 fi
 
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -503,7 +511,6 @@ fi
 %{_kde4_bindir}/solid-network
 %{_kde4_bindir}/startkde
 %{_kde4_bindir}/systemsettings
-%{_kde4_appsdir}/color-schemes/
 %{_kde4_appsdir}/desktoptheme/
 %{_kde4_appsdir}/freespacenotifier/
 %{_kde4_appsdir}/kaccess/
@@ -544,7 +551,6 @@ fi
 %{_kde4_configdir}/activities.knsrc
 %{_kde4_configdir}/aurorae.knsrc
 %{_kde4_configdir}/background.knsrc
-%{_kde4_configdir}/colorschemes.knsrc
 %{_kde4_configdir}/ksplash.knsrc
 %{_kde4_configdir}/plasma-overlayrc
 %{_kde4_configdir}/plasma-themes.knsrc
@@ -580,6 +586,7 @@ fi
 %{_datadir}/xsessions/*.desktop
 %{_kde4_docdir}/HTML/en/kfontview/
 %{_kde4_docdir}/HTML/en/kcontrol/
+%exclude %{_kde4_docdir}/HTML/en/kcontrol/colors/
 %{_kde4_docdir}/HTML/en/kinfocenter/
 %{_kde4_docdir}/HTML/en/klipper/
 %{_kde4_docdir}/HTML/en/kmenuedit/
@@ -592,6 +599,7 @@ fi
 %{_kde4_libdir}/kde4/icon_mode.so
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kcm_colors.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/keyboard_layout_widget.so
@@ -768,6 +776,21 @@ fi
 %{_kde4_appsdir}/ksplash/Themes/Default/
 %{_kde4_appsdir}/ksplash/Themes/Minimalistic/
 
+%files -n kcm_colors
+%{_kde4_datadir}/kde4/services/colors.desktop
+%{_kde4_libdir}/kde4/kcm_colors.so
+%{_kde4_configdir}/colorschemes.knsrc
+%{_kde4_docdir}/HTML/en/kcontrol/colors/
+%{_kde4_appsdir}/color-schemes/Honeycomb.colors
+%{_kde4_appsdir}/color-schemes/Norway.colors
+%{_kde4_appsdir}/color-schemes/ObsidianCoast.colors
+%{_kde4_appsdir}/color-schemes/Oxygen.colors
+%{_kde4_appsdir}/color-schemes/OxygenCold.colors
+%{_kde4_appsdir}/color-schemes/Steel.colors
+%{_kde4_appsdir}/color-schemes/WontonSoup.colors
+%{_kde4_appsdir}/color-schemes/Zion.colors
+%{_kde4_appsdir}/color-schemes/ZionReversed.colors
+
 %files -n kdm
 %defattr(-,root,root,-)
 %{_kde4_bindir}/genkdmconf
@@ -903,6 +926,10 @@ fi
 
 
 %changelog
+* Tue Jan 24 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-2
+- kcm_colors subpkg (#761184)
+- kdm-themes: Requires: kde-wallpapers unconditionally (#784389)
+
 * Fri Jan 20 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.0-1
 - 4.8.0