[kde-settings] - de-Laughlin-ize theming, be genericish/upstream (for now) - kcminputrc: theme=dmz-aa, Requires: dm

[Rex Dieter]

commit 4860ac71ac0ab4a82e67931307d110aa98f0f7d1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Feb 7 15:43:49 2011 -0600

    - de-Laughlin-ize theming, be genericish/upstream (for now)
    - kcminputrc: theme=dmz-aa, Requires: dmz-cursor-themes (#675509)

 .gitignore        |    3 +--
 kde-settings.spec |   11 +++++++++--
 sources           |    2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5deec95..384cbc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kde-settings-4.6-2.tar.bz2
-/kde-settings-4.6-3.tar.bz2
+/kde-settings-4.6-4.tar.bz2
diff --git a/kde-settings.spec b/kde-settings.spec
index 3ac9c97..111ffe6 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F15+ ONLY!
 
-%define rel 3
+%define rel 4
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -26,6 +26,8 @@ Requires: pam
 Requires: xdg-user-dirs
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: coreutils sed util-linux
+# hard-code dmz-cursor-themes to workaround https://bugzilla.redhat.com/show_bug.cgi?id=675509
+Requires: dmz-cursor-themes
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -38,7 +40,8 @@ Summary: Configuration files for kdm
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < 4.0 
 Requires: kdm
-Requires: system-kdm-theme
+# use kde defaults for now -- Rex
+#Requires: system-kdm-theme
 Requires(pre): coreutils
 Requires(post): coreutils grep sed
 Requires(post): kde4-macros(api) = %{_kde4_macros_api}
@@ -150,6 +153,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb 07 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6-4
+- de-Laughlin-ize theming, be genericish/upstream (for now)
+- kcminputrc: theme=dmz-aa, Requires: dmz-cursor-themes (#675509)
+
 * Tue Feb 01 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6-3
 - add support for the postlogin PAM stack to kdm (#665060)
 
diff --git a/sources b/sources
index bea4065..f10b7dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4194dbcef58a324d004041e858818846  kde-settings-4.6-3.tar.bz2
+63a1c82376ca03740f43206c9bf78e66  kde-settings-4.6-4.tar.bz2