[kde-settings: 1/2] use lovelock-kdm-theme /var/log/kdm.log is never clean up (logrotate) (#682761) kdm, move xterm dep

[Rex Dieter]

commit 91badd47893e4a602879269cb539c5e2042af949
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 7 10:55:34 2011 -0600

    use lovelock-kdm-theme
    /var/log/kdm.log is never clean up (logrotate) (#682761)
    kdm, move xterm dep to comps (#491251)

 .gitignore        |    2 +-
 kde-settings.spec |   23 ++++++++++-------------
 kdm.conf          |    1 -
 sources           |    2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 384cbc3..78352fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kde-settings-4.6-4.tar.bz2
+/kde-settings-4.6-6.tar.bz2
diff --git a/kde-settings.spec b/kde-settings.spec
index 111ffe6..7d5fb78 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F15+ ONLY!
 
-%define rel 4
+%define rel 6
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -11,16 +11,12 @@ Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
 Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{rel}.tar.bz2
-# extra source for now
-Source1: kdm.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: kde-filesystem
 
 Requires: kde-filesystem
-## as-of 4.5-4 , no longer using any external icon bits (#615621)
-#Requires: system-kde-icon-theme
 # /etc/pam.d/ ownership
 Requires: pam
 Requires: xdg-user-dirs
@@ -38,15 +34,11 @@ Requires(postun): coreutils
 %package kdm
 Summary: Configuration files for kdm
 Group:	 System Environment/Base
-Obsoletes: kde-config-kdm < 4.0 
 Requires: kdm
-# use kde defaults for now -- Rex
-#Requires: system-kdm-theme
+Requires: system-kdm-theme
 Requires(pre): coreutils
 Requires(post): coreutils grep sed
 Requires(post): kde4-macros(api) = %{_kde4_macros_api}
-# failsafe session (rhbz#491251)
-Requires: xterm
 %description kdm
 %{summary}.
 
@@ -97,9 +89,6 @@ rm -f %{buildroot}%{_sysconfdir}/kde/env/fedora-bookmarks.sh \
       %{buildroot}%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
 %endif
 
-# /var/run tempfs fun
-install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/kdm.conf
-
 
 %clean
 rm -rf %{buildroot}
@@ -144,6 +133,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/kde/kdm/Xsession
 %config(noreplace) %{_sysconfdir}/kde/kdm/Xsetup
 %config(noreplace) %{_sysconfdir}/kde/kdm/Xwilling
+# own logrotate.d/ avoiding hard dep on logrotate
+%dir %{_sysconfdir}/logrotate.d
+%config(noreplace) %{_sysconfdir}/logrotate.d/kdm
 %{_sysconfdir}/tmpfiles.d/kdm.conf
 %attr(0775,root,root) %dir %{_localstatedir}/spool/gdm
 
@@ -153,6 +145,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 07 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6-6
+- use lovelock-kdm-theme
+- /var/log/kdm.log is never clean up (logrotate) (#682761)
+- -kdm, move xterm dep to comps (#491251)
+
 * 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)
diff --git a/sources b/sources
index f10b7dd..72fe1ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63a1c82376ca03740f43206c9bf78e66  kde-settings-4.6-4.tar.bz2
+045e5319908aa4514bdb7e589dc1ac76  kde-settings-4.6-6.tar.bz2