[kdebase-workspace] use system-kde-theme again (ie, lovelock-kde-theme on f15)

[Rex Dieter]

commit 2b29ee711e9c56e99f30a9b6dc73b1b8ff737df5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 7 11:16:47 2011 -0600

    use system-kde-theme again (ie, lovelock-kde-theme on f15)

 kdebase-workspace.spec |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 6c69332..d0befee 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.1
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version 4.6.1
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -79,8 +79,6 @@ Obsoletes: kdebase-workspace < 4.3.0-2
 
 # kinfocenter moved kdebase-4.4 -> kdebase-workspace-4.5
 Conflicts: kdebase < 6:4.4.80
-# Horos wallpaper moved here in 4.6.0-8
-Conflicts: kdebase-workspace-wallpaper < 4.6.0-8
 
 Requires: polkit-kde
 
@@ -155,9 +153,8 @@ Requires: xorg-x11-utils
 Requires: xorg-x11-server-utils
 
 %define default_face_icon default1.png
-## use generic/upstream theming, for now -- Rex
-#Requires: system-backgrounds-kde
-#Requires: system-ksplash-theme
+Requires: system-backgrounds-kde
+Requires: system-ksplash-theme
 
 # Temporary solution until nepomukcontroller is merged back to kdebase-workspace
 Requires: nepomukcontroller
@@ -211,6 +208,8 @@ Requires: %{name} = %{version}-%{release}
 %package wallpapers
 Summary: KDE wallpapers
 Group: User Interface/Desktops
+# Horos wallpaper moved back here in 4.6.1-2 (originally moved to main in 4.6.0-8)
+Conflicts: kdebase-workspace-wallpaper < 4.6.1-2
 Requires: kde-filesystem
 BuildArch: noarch
 %description wallpapers
@@ -539,7 +538,6 @@ fi
 %{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
 %{_mandir}/man1/plasm*.1*
-%{_kde4_datadir}/wallpapers/Horos/
 
 %if 0%{?fedora}
 # googlegadgets
@@ -646,6 +644,7 @@ fi
 %{_kde4_datadir}/wallpapers/Fresh_Morning/
 %{_kde4_datadir}/wallpapers/Grass/
 %{_kde4_datadir}/wallpapers/Hanami/
+%{_kde4_datadir}/wallpapers/Horos/
 %{_kde4_datadir}/wallpapers/Media_Life/
 %{_kde4_datadir}/wallpapers/Plasmalicious/
 %{_kde4_datadir}/wallpapers/Quadros
@@ -714,6 +713,9 @@ fi
 
 
 %changelog
+* Mon Mar 07 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.1-2
+- use system-kde-theme again (ie, lovelock-kde-theme on f15)
+
 * Sat Feb 26 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.1-1
 - 4.6.1